From 57a085b52a22fd136af1e1b2ed8d4e3bd9a4ff73 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 18 Jun 2011 09:31:24 +0000
Subject: [PATCH] CtrlCore: bool support to Ref

git-svn-id: svn://ultimatepp.org/upp/trunk@3545 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Value.cpp | 3 +--
 uppsrc/Core/Value.h   | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/uppsrc/Core/Value.cpp b/uppsrc/Core/Value.cpp
index abe87f554..314d658fc 100644
--- a/uppsrc/Core/Value.cpp
+++ b/uppsrc/Core/Value.cpp
@@ -237,15 +237,14 @@ struct Ref::ValueRef : public RefManager {
 	virtual void  SetNull(void *ptr)                   { *(Value *) ptr = Null; }
 };
 
-
 Ref::Ref(String& s)  { ptr = &s; m = &Single< RichRef<String> >(); }
 Ref::Ref(WString& s) { ptr = &s; m = &Single< RichRef<WString> >(); }
 Ref::Ref(int& i)     { ptr = &i; m = &Single< RichRef<int> >(); }
 Ref::Ref(int64& i)   { ptr = &i; m = &Single< RichRef<int64> >(); }
 Ref::Ref(double& d)  { ptr = &d; m = &Single< RichRef<double> >(); }
+Ref::Ref(bool& b)    { ptr = &b; m = &Single< RichRef<bool> >(); }
 Ref::Ref(Date& d)    { ptr = &d; m = &Single< RichRef<Date> >(); }
 Ref::Ref(Time& t)    { ptr = &t; m = &Single< RichRef<Time> >(); }
-
 Ref::Ref(Value& v)   { ptr = &v; m = &Single< ValueRef >(); }
 
 // ----------------------------------
diff --git a/uppsrc/Core/Value.h b/uppsrc/Core/Value.h
index 048c2f711..969daeb39 100644
--- a/uppsrc/Core/Value.h
+++ b/uppsrc/Core/Value.h
@@ -555,14 +555,16 @@ protected:
 
 public:
 	dword    GetType() const           { return m ? m->GetType() : VOID_V; }
-	operator Value() const             { return m ? m->GetValue(ptr) : Value(); }
 	bool     IsNull() const            { return m ? m->IsNull(ptr) : true; }
 
 	void    *GetVoidPtr() const        { return ptr; }
 
 	void     SetNull()                 { if(m) m->SetNull(ptr); }
+	Value    GetValue() const          { return m ? m->GetValue(ptr) : Value(); }
 	void     SetValue(const Value& v)  { ASSERT(m); m->SetValue(ptr, v); }
 
+	operator Value() const             { return GetValue(); }
+	Value    operator~() const         { return GetValue(); }
 	Ref&     operator=(const Value& v) { SetValue(v); return *this; }
 
 	Ref(String& s);
@@ -570,6 +572,7 @@ public:
 	Ref(int& i);
 	Ref(int64& i);
 	Ref(double& d);
+	Ref(bool& b);
 	Ref(Date& d);
 	Ref(Time& t);
 	Ref(Value& v);
@@ -588,6 +591,7 @@ inline WString& RefWString(Ref f) { return GetRef<WString>(f); }
 inline int&     RefInt(Ref f)     { return GetRef<int>(f); }
 inline int64&   RefInt64(Ref f)   { return GetRef<int64>(f); }
 inline double&  RefDouble(Ref f)  { return GetRef<double>(f); }
+inline bool&    RefBool(Ref f)    { return GetRef<bool>(f); }
 inline Date&    RefDate(Ref f)    { return GetRef<Date>(f); }
 inline Time&    RefTime(Ref f)    { return GetRef<Time>(f); }
 inline Value&   RefValue(Ref f)   { ASSERT(f.GetType() == VALUE_V);