Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[2690] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2012-01-26 17:23:51
|
Revision: 2690
http://zoolib.svn.sourceforge.net/zoolib/?rev=2690&view=rev
Author: agreen
Date: 2012-01-26 17:23:43 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Conform to ZVisitee::Accept change.
Remove CoerceReal.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp
trunk/zoolib/source/cxx/zoolib/ZDebug.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -131,7 +131,7 @@
virtual void Finalize();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
@@ -172,9 +172,9 @@
void Source_Union::Proxy::Finalize()
{ fSource->pFinalizeProxy(this); }
-void Source_Union::Proxy::Accept(ZVisitor& iVisitor)
+void Source_Union::Proxy::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Proxy* theVisitor = dynamic_cast<Visitor_Proxy*>(&iVisitor))
+ if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy*>(&iVisitor))
this->Accept_Proxy(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -182,7 +182,7 @@
void Source_Union::Proxy::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZRA::Expr_Rel>& iVisitor)
{
- if (Visitor_Proxy* theVisitor = dynamic_cast<Visitor_Proxy*>(&iVisitor))
+ if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy*>(&iVisitor))
this->Accept_Proxy(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -299,7 +299,7 @@
{
return Value(double(theQ.Get()));
}
- else if (ZQ<double> theQ = sQCoerceReal(iAny))
+ else if (ZQ<double> theQ = sQCoerceRat(iAny))
{
return Value(theQ.Get());
}
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -66,7 +66,7 @@
#if ZCONFIG_SPI_Enabled(Win)
template <typename P>
-P sLookup_T(HMODULE iHMODULE, const char* iName)
+P spLookup(HMODULE iHMODULE, const char* iName)
{ return reinterpret_cast<P>(::GetProcAddress(iHMODULE, iName)); }
static ZQ<int> spQGetMajorVersion(const UTF16* iNativePath)
@@ -109,17 +109,14 @@
return nullptr;
}
-static void* spLookup(NSModule iModule, const char* iName)
+template <typename P>
+P spLookup(NSModule iNSModule, const char* iName)
{
- if (NSSymbol theSymbol = ::NSLookupSymbolInModule(iModule, iName))
- return ::NSAddressOfSymbol(theSymbol);
+ if (NSSymbol theSymbol = ::NSLookupSymbolInModule(iNSModule, iName))
+ return reinterpret_cast<P>(::NSAddressOfSymbol(theSymbol));
return nullptr;
}
-template <typename P>
-P sLookup_T(NSModule iNSModule, const char* iName)
- { return reinterpret_cast<P>(spLookup(iNSModule, iName)); }
-
#endif // ZCONFIG_SPI_Enabled(CoreFoundation) && __MACH__
// =================================================================================================
@@ -128,7 +125,7 @@
#if ZCONFIG_SPI_Enabled(CoreFoundation)
template <typename P>
-P sLookup_T(CFBundleRef iBundleRef, CFStringRef iName)
+P spLookup(CFBundleRef iBundleRef, CFStringRef iName)
{ return reinterpret_cast<P>(::CFBundleGetFunctionPointerForName(iBundleRef, iName)); }
ZQ<int> spQGetMajorVersion(const ZRef<CFStringRef>& iStringRef)
@@ -193,14 +190,14 @@
ZMemZero_T(fNPPluginFuncs);
fNPPluginFuncs.size = sizeof(NPPluginFuncs);
- fShutdown = sLookup_T<NPP_ShutdownProcPtr>(fHMODULE, "NP_Shutdown");
+ fShutdown = spLookup<NPP_ShutdownProcPtr>(fHMODULE, "NP_Shutdown");
NP_InitializeFuncPtr theInit =
- sLookup_T<NP_InitializeFuncPtr>
+ spLookup<NP_InitializeFuncPtr>
(fHMODULE, "NP_Initialize");
NP_GetEntryPointsFuncPtr theEntryPoints =
- sLookup_T<NP_GetEntryPointsFuncPtr>
+ spLookup<NP_GetEntryPointsFuncPtr>
(fHMODULE, "NP_GetEntryPoints");
if (!fShutdown || !theInit || !theEntryPoints)
@@ -210,7 +207,7 @@
theEntryPoints(&fNPPluginFuncs);
if (Flash_DisableLocalSecurityFuncPtr theDLS =
- sLookup_T<Flash_DisableLocalSecurityFuncPtr>(fHMODULE, "Flash_DisableLocalSecurity"))
+ spLookup<Flash_DisableLocalSecurityFuncPtr>(fHMODULE, "Flash_DisableLocalSecurity"))
{
theDLS();
}
@@ -296,24 +293,22 @@
// don't do this, and unload the bundle, then any subsequent loader will
// get nils for any entry point. In Safari this manifests with a
// "Internal error unloading bundle" log message.
- bool isMachOPlugin = ::CFBundleGetFunctionPointerForName(theBundleRef, CFSTR("NP_Initialize"));
-
// This also tells us that the NP_Initialize entry point exists, so it's
// a macho binary (CFM would only provide 'main'), and we should use NSModule
// to load our independent instantiation.
- if (isMachOPlugin)
+ if (::CFBundleGetFunctionPointerForName(theBundleRef, CFSTR("NP_Initialize")))
{
fNSModule = spLoadNSModule(theBundleRef);
- fShutdown = sLookup_T<NPP_ShutdownProcPtr>(fNSModule, "_NP_Shutdown");
+ fShutdown = spLookup<NPP_ShutdownProcPtr>(fNSModule, "_NP_Shutdown");
NP_GetEntryPointsFuncPtr theEntryPoints =
- sLookup_T<NP_GetEntryPointsFuncPtr>
+ spLookup<NP_GetEntryPointsFuncPtr>
(fNSModule, "_NP_GetEntryPoints");
NP_InitializeFuncPtr theInit =
- sLookup_T<NP_InitializeFuncPtr>
+ spLookup<NP_InitializeFuncPtr>
(fNSModule, "_NP_Initialize");
if (!fShutdown || !theInit || !theEntryPoints)
@@ -350,7 +345,7 @@
// lookup mechanism will have created a MachO-callable thunk for it.
MainFuncPtr theMain =
- sLookup_T<MainFuncPtr>
+ spLookup<MainFuncPtr>
(theBundleRef, CFSTR("main"));
if (!theMain)
@@ -441,7 +436,7 @@
CFBundleRef theBundleRef = ::CFPlugInGetBundle(fPlugInRef);
// We're PowerPC -- look for main(), and if it's there we can just call it.
- MainFuncPtr theMain = sLookup_T<MainFuncPtr>(theBundleRef, CFSTR("main"));
+ MainFuncPtr theMain = spLookup<MainFuncPtr>(theBundleRef, CFSTR("main"));
if (theMain)
{
@@ -456,14 +451,14 @@
(fNPNF.size - offsetof(NPNetscapeFuncs_Z, geturl)) / sizeof(void*),
fGlue_NPNF);
- fShutdown = sLookup_T<NPP_ShutdownProcPtr>(theBundleRef, CFSTR("NP_Shutdown"));
+ fShutdown = spLookup<NPP_ShutdownProcPtr>(theBundleRef, CFSTR("NP_Shutdown"));
NP_GetEntryPointsFuncPtr theEntryPoints =
- sLookup_T<NP_GetEntryPointsFuncPtr>
+ spLookup<NP_GetEntryPointsFuncPtr>
(theBundleRef, CFSTR("NP_GetEntryPoints"));
NP_InitializeFuncPtr theInit =
- sLookup_T<NP_InitializeFuncPtr>
+ spLookup<NP_InitializeFuncPtr>
(theBundleRef, CFSTR("NP_Initialize"));
if (!fShutdown || !theInit || !theEntryPoints)
Modified: trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -47,20 +47,22 @@
, fExpr_Bool(iExpr_Bool)
{}
-void Expr_Rel_Search::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Search::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Search* theVisitor = dynamic_cast<Visitor_Expr_Rel_Search*>(&iVisitor))
- this->Accept_Expr_Rel_Search(*theVisitor);
+ if (Visitor_Expr_Rel_Search* theVisitor =
+ DynNonConst<Visitor_Expr_Rel_Search*>(&iVisitor))
+ { this->Accept_Expr_Rel_Search(*theVisitor); }
else
- inherited::Accept(iVisitor);
+ { inherited::Accept(iVisitor); }
}
void Expr_Rel_Search::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZRA::Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Search* theVisitor = dynamic_cast<Visitor_Expr_Rel_Search*>(&iVisitor))
- this->Accept_Expr_Rel_Search(*theVisitor);
+ if (Visitor_Expr_Rel_Search* theVisitor =
+ DynNonConst<Visitor_Expr_Rel_Search*>(&iVisitor))
+ { this->Accept_Expr_Rel_Search(*theVisitor); }
else
- inherited::Accept_Expr_Op0(iVisitor);
+ { inherited::Accept_Expr_Op0(iVisitor); }
}
ZRef<ZRA::Expr_Rel> Expr_Rel_Search::Self()
Modified: trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -42,7 +42,7 @@
Expr_Rel_Search(const ZRA::Rename& iRename, const ZRef<ZExpr_Bool>& iExpr_Bool);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -64,9 +64,9 @@
Expr_Rel_Calc::~Expr_Rel_Calc()
{}
-void Expr_Rel_Calc::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Calc::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Calc* theVisitor = dynamic_cast<Visitor_Expr_Rel_Calc*>(&iVisitor))
+ if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc*>(&iVisitor))
this->Accept_Expr_Rel_Calc(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -74,7 +74,7 @@
void Expr_Rel_Calc::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Calc* theVisitor = dynamic_cast<Visitor_Expr_Rel_Calc*>(&iVisitor))
+ if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc*>(&iVisitor))
this->Accept_Expr_Rel_Calc(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -52,7 +52,7 @@
virtual ~Expr_Rel_Calc();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -41,9 +41,9 @@
: fRelHead(iRelHead)
{}
-void Expr_Rel_Concrete::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Concrete::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Concrete* theVisitor = dynamic_cast<Visitor_Expr_Rel_Concrete*>(&iVisitor))
+ if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete*>(&iVisitor))
this->Accept_Expr_Rel_Concrete(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -51,7 +51,7 @@
void Expr_Rel_Concrete::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Concrete* theVisitor = dynamic_cast<Visitor_Expr_Rel_Concrete*>(&iVisitor))
+ if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete*>(&iVisitor))
this->Accept_Expr_Rel_Concrete(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -44,7 +44,7 @@
Expr_Rel_Concrete(const RelHead& iRelHead);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -50,9 +50,9 @@
Expr_Rel_Const::~Expr_Rel_Const()
{}
-void Expr_Rel_Const::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Const::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Const* theVisitor = dynamic_cast<Visitor_Expr_Rel_Const*>(&iVisitor))
+ if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const*>(&iVisitor))
this->Accept_Expr_Rel_Const(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Const::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Const* theVisitor = dynamic_cast<Visitor_Expr_Rel_Const*>(&iVisitor))
+ if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const*>(&iVisitor))
this->Accept_Expr_Rel_Const(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -45,7 +45,7 @@
virtual ~Expr_Rel_Const();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -43,9 +43,9 @@
Expr_Rel_Dee::~Expr_Rel_Dee()
{}
-void Expr_Rel_Dee::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Dee::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Dee* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dee*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee*>(&iVisitor))
this->Accept_Expr_Rel_Dee(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -53,7 +53,7 @@
void Expr_Rel_Dee::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Dee* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dee*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee*>(&iVisitor))
this->Accept_Expr_Rel_Dee(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -46,7 +46,7 @@
virtual ~Expr_Rel_Dee();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -49,7 +49,7 @@
void Expr_Rel_Difference::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
if (Visitor_Expr_Rel_Difference* theVisitor =
- dynamic_cast<Visitor_Expr_Rel_Difference*>(&iVisitor))
+ DynNonConst<Visitor_Expr_Rel_Difference*>(&iVisitor))
{
this->Accept_Expr_Rel_Difference(*theVisitor);
}
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -43,9 +43,9 @@
Expr_Rel_Dum::~Expr_Rel_Dum()
{}
-void Expr_Rel_Dum::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Dum::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Dum* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dum*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum*>(&iVisitor))
this->Accept_Expr_Rel_Dum(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -53,7 +53,7 @@
void Expr_Rel_Dum::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Dum* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dum*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum*>(&iVisitor))
this->Accept_Expr_Rel_Dum(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -46,7 +46,7 @@
virtual ~Expr_Rel_Dum();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -52,9 +52,9 @@
, fRelName(iRelName)
{}
-void Expr_Rel_Embed::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Embed::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Embed* theVisitor = dynamic_cast<Visitor_Expr_Rel_Embed*>(&iVisitor))
+ if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed*>(&iVisitor))
this->Accept_Expr_Rel_Embed(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -62,7 +62,7 @@
void Expr_Rel_Embed::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Embed* theVisitor = dynamic_cast<Visitor_Expr_Rel_Embed*>(&iVisitor))
+ if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed*>(&iVisitor))
this->Accept_Expr_Rel_Embed(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -43,7 +43,7 @@
const RelName& iRelName, const ZRef<Expr_Rel>& iEmbedee);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -46,9 +46,9 @@
: inherited(iOp0, iOp1)
{}
-void Expr_Rel_Product::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Product::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Product* theVisitor = dynamic_cast<Visitor_Expr_Rel_Product*>(&iVisitor))
+ if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product*>(&iVisitor))
this->Accept_Expr_Rel_Product(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -56,7 +56,7 @@
void Expr_Rel_Product::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Product* theVisitor = dynamic_cast<Visitor_Expr_Rel_Product*>(&iVisitor))
+ if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product*>(&iVisitor))
this->Accept_Expr_Rel_Product(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -42,7 +42,7 @@
Expr_Rel_Product(const ZRef<Expr_Rel>& iOp0, const ZRef<Expr_Rel>& iOp1);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -50,9 +50,9 @@
Expr_Rel_Project::~Expr_Rel_Project()
{}
-void Expr_Rel_Project::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Project::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Project* theVisitor = dynamic_cast<Visitor_Expr_Rel_Project*>(&iVisitor))
+ if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project*>(&iVisitor))
this->Accept_Expr_Rel_Project(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Project::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Project* theVisitor = dynamic_cast<Visitor_Expr_Rel_Project*>(&iVisitor))
+ if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project*>(&iVisitor))
this->Accept_Expr_Rel_Project(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -44,7 +44,7 @@
virtual ~Expr_Rel_Project();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -59,9 +59,9 @@
Expr_Rel_Rename::~Expr_Rel_Rename()
{}
-void Expr_Rel_Rename::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Rename::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Rename* theVisitor = dynamic_cast<Visitor_Expr_Rel_Rename*>(&iVisitor))
+ if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename*>(&iVisitor))
this->Accept_Expr_Rel_Rename(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -69,7 +69,7 @@
void Expr_Rel_Rename::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Rename* theVisitor = dynamic_cast<Visitor_Expr_Rel_Rename*>(&iVisitor))
+ if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename*>(&iVisitor))
this->Accept_Expr_Rel_Rename(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -45,7 +45,7 @@
virtual ~Expr_Rel_Rename();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -50,9 +50,9 @@
Expr_Rel_Restrict::~Expr_Rel_Restrict()
{}
-void Expr_Rel_Restrict::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Restrict::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor = dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
+ if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict*>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Restrict::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor = dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
+ if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict*>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -44,7 +44,7 @@
virtual ~Expr_Rel_Restrict();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -48,7 +48,7 @@
void Expr_Rel_Union::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Union* theVisitor = dynamic_cast<Visitor_Expr_Rel_Union*>(&iVisitor))
+ if (Visitor_Expr_Rel_Union* theVisitor = DynNonConst<Visitor_Expr_Rel_Union*>(&iVisitor))
this->Accept_Expr_Rel_Union(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -54,7 +54,8 @@
fBaseAddress = nullptr;
}
-EFormatStandard sAsFormatStandard(OSType iOSType)
+static
+EFormatStandard spAsFormatStandard(OSType iOSType)
{
switch (iOSType)
{
@@ -81,7 +82,7 @@
ZDCPixmap sPixmap(ZRef<CVPixelBufferRef> iPBR)
{
const OSType thePFT = ::CVPixelBufferGetPixelFormatType(iPBR);
- const EFormatStandard theFormat = sAsFormatStandard(thePFT);
+ const EFormatStandard theFormat = spAsFormatStandard(thePFT);
const size_t theRowBytes = ::CVPixelBufferGetBytesPerRow(iPBR);
const size_t theHeight = ::CVPixelBufferGetHeight(iPBR);
Modified: trunk/zoolib/source/cxx/zoolib/ZDebug.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDebug.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZDebug.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -24,6 +24,7 @@
#include "zoolib/ZCONFIG_SPI.h"
#include <stdio.h>
+#include <stdlib.h> // For abort
#include <string.h>
#if ZCONFIG(Compiler, MSVC)
@@ -287,6 +288,9 @@
// Perhaps it should throw an exception in production code.
void ZUnimplemented()
- { ZDebugStopf(0, ("Unimplemented routine")); }
+ {
+ ZDebugStopf(0, ("Unimplemented routine"));
+ abort();
+ }
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -41,9 +41,9 @@
return spTrue;
}
-void ZExpr_Bool_True::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_True::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_True* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_True*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True*>(&iVisitor))
this->Accept_Expr_Bool_True(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -51,7 +51,7 @@
void ZExpr_Bool_True::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_True* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_True*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True*>(&iVisitor))
this->Accept_Expr_Bool_True(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
@@ -90,9 +90,9 @@
return spFalse;
}
-void ZExpr_Bool_False::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_False::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_False* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_False*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False*>(&iVisitor))
this->Accept_Expr_Bool_False(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -100,7 +100,7 @@
void ZExpr_Bool_False::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_False* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_False*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False*>(&iVisitor))
this->Accept_Expr_Bool_False(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
@@ -134,9 +134,9 @@
: inherited(iOp0)
{}
-void ZExpr_Bool_Not::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_Not::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_Not* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Not*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not*>(&iVisitor))
this->Accept_Expr_Bool_Not(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -144,7 +144,7 @@
void ZExpr_Bool_Not::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Not* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Not*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not*>(&iVisitor))
this->Accept_Expr_Bool_Not(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
@@ -178,9 +178,9 @@
: inherited(iOp0, iOp1)
{}
-void ZExpr_Bool_And::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_And::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_And* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_And*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And*>(&iVisitor))
this->Accept_Expr_Bool_And(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -188,7 +188,7 @@
void ZExpr_Bool_And::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_And* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_And*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And*>(&iVisitor))
this->Accept_Expr_Bool_And(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
@@ -226,9 +226,9 @@
: inherited(iOp0, iOp1)
{}
-void ZExpr_Bool_Or::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_Or::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_Or* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Or*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or*>(&iVisitor))
this->Accept_Expr_Bool_Or(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -236,7 +236,7 @@
void ZExpr_Bool_Or::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Or* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Or*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or*>(&iVisitor))
this->Accept_Expr_Bool_Or(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -53,7 +53,7 @@
static ZRef<ZExpr_Bool> sTrue();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
@@ -96,7 +96,7 @@
static ZRef<ZExpr_Bool> sFalse();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
@@ -135,7 +135,7 @@
ZExpr_Bool_Not(const ZRef<ZExpr_Bool>& iOp0);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<ZExpr_Bool>& iVisitor);
@@ -174,7 +174,7 @@
ZExpr_Bool_And(const ZRef<ZExpr_Bool>& iOp0, const ZRef<ZExpr_Bool>& iOp1);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor);
@@ -213,7 +213,7 @@
ZExpr_Bool_Or(const ZRef<ZExpr_Bool>& iOp0, const ZRef<ZExpr_Bool>& iOp1);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -33,30 +33,22 @@
ZExpr_Bool_ValPred::~ZExpr_Bool_ValPred()
{}
-void ZExpr_Bool_ValPred::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_ValPred::Accept(const ZVisitor& iVisitor)
{
if (ZVisitor_Expr_Bool_ValPred* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
- {
- this->Accept_Expr_Bool_ValPred(*theVisitor);
- }
+ DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
+ { this->Accept_Expr_Bool_ValPred(*theVisitor); }
else
- {
- inherited::Accept(iVisitor);
- }
+ { inherited::Accept(iVisitor); }
}
void ZExpr_Bool_ValPred::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
if (ZVisitor_Expr_Bool_ValPred* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
- {
- this->Accept_Expr_Bool_ValPred(*theVisitor);
- }
+ DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
+ { this->Accept_Expr_Bool_ValPred(*theVisitor); }
else
- {
- inherited::Accept_Expr_Op0(iVisitor);
- }
+ { inherited::Accept_Expr_Op0(iVisitor); }
}
ZRef<ZExpr_Bool> ZExpr_Bool_ValPred::Self()
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -42,7 +42,7 @@
virtual ~ZExpr_Bool_ValPred();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -47,9 +47,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op0_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
this->Accept_Expr_Op0(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -58,10 +58,14 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op0_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ {
this->Accept_Expr_Op0(*theVisitor);
+ }
else
+ {
ZExpr::Accept_Expr(iVisitor);
+ }
}
// Our protocol
@@ -108,9 +112,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op1_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
this->Accept_Expr_Op1(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -119,7 +123,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op1_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
this->Accept_Expr_Op1(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
@@ -180,9 +184,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op2_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
this->Accept_Expr_Op2(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -191,7 +195,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op2_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
this->Accept_Expr_Op2(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
@@ -255,9 +259,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_OpN_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
this->Accept_Expr_OpN(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -266,7 +270,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_OpN_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
this->Accept_Expr_OpN(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -33,22 +33,22 @@
if (const bool* pBool = iAny.PGet<bool>())
return *pBool;
- if (ZQ<int64> qInt64 = sQCoerceInt(iAny))
- return (0 != qInt64.Get());
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
+ return *theQ;
- if (ZQ<double> qDouble = sQCoerceReal(iAny))
- return (0.0 != qDouble.Get());
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
+ return *theQ;
if (const string* pString = iAny.PGet<string>())
{
if (pString->empty())
return false;
- if (ZQ<double> qDouble = ZUtil_string::sQDouble(*pString))
- return (0.0 != qDouble.Get());
+ if (ZQ<double> theQ = ZUtil_string::sQDouble(*pString))
+ return *theQ;
- if (ZQ<int64> qInt64 = ZUtil_string::sQInt64(*pString))
- return (0 != qInt64.Get());
+ if (ZQ<int64> theQ = ZUtil_string::sQInt64(*pString))
+ return *theQ;
if (ZUtil_string::sEquali(*pString, "t") || ZUtil_string::sEquali(*pString, "true"))
return true;
@@ -61,9 +61,9 @@
bool sQCoerceBool(const ZAny& iAny, bool& oVal)
{
- if (ZQ<bool> qBool = sQCoerceBool(iAny))
+ if (ZQ<bool> theQ = sQCoerceBool(iAny))
{
- oVal = qBool.Get();
+ oVal = *theQ;
return true;
}
return false;
@@ -71,15 +71,15 @@
bool sDCoerceBool(bool iDefault, const ZAny& iAny)
{
- if (ZQ<bool> qBool = sQCoerceBool(iAny))
- return qBool.Get();
+ if (ZQ<bool> theQ = sQCoerceBool(iAny))
+ return *theQ;
return iDefault;
}
bool sCoerceBool(const ZAny& iAny)
{
- if (ZQ<bool> qBool = sQCoerceBool(iAny))
- return qBool.Get();
+ if (ZQ<bool> theQ = sQCoerceBool(iAny))
+ return *theQ;
return false;
}
@@ -87,39 +87,39 @@
{
if (false)
{}
- else if (const char* theVal = iAny.PGet<char>())
- return *theVal;
- else if (const signed char* theVal = iAny.PGet<signed char>())
- return *theVal;
- else if (const unsigned char* theVal = iAny.PGet<unsigned char>())
- return *theVal;
- else if (const wchar_t* theVal = iAny.PGet<wchar_t>())
- return *theVal;
- else if (const short* theVal = iAny.PGet<short>())
- return *theVal;
- else if (const unsigned short* theVal = iAny.PGet<unsigned short>())
- return *theVal;
- else if (const int* theVal = iAny.PGet<int>())
- return *theVal;
- else if (const unsigned int* theVal = iAny.PGet<unsigned int>())
- return *theVal;
- else if (const long* theVal = iAny.PGet<long>())
- return *theVal;
- else if (const unsigned long* theVal = iAny.PGet<unsigned long>())
- return *theVal;
- else if (const int64* theVal = iAny.PGet<int64>())
- return *theVal;
- else if (const uint64* theVal = iAny.PGet<uint64>())
- return *theVal;
+ else if (const char* theP = iAny.PGet<char>())
+ return *theP;
+ else if (const signed char* theP = iAny.PGet<signed char>())
+ return *theP;
+ else if (const unsigned char* theP = iAny.PGet<unsigned char>())
+ return *theP;
+ else if (const wchar_t* theP = iAny.PGet<wchar_t>())
+ return *theP;
+ else if (const short* theP = iAny.PGet<short>())
+ return *theP;
+ else if (const unsigned short* theP = iAny.PGet<unsigned short>())
+ return *theP;
+ else if (const int* theP = iAny.PGet<int>())
+ return *theP;
+ else if (const unsigned int* theP = iAny.PGet<unsigned int>())
+ return *theP;
+ else if (const long* theP = iAny.PGet<long>())
+ return *theP;
+ else if (const unsigned long* theP = iAny.PGet<unsigned long>())
+ return *theP;
+ else if (const int64* theP = iAny.PGet<int64>())
+ return *theP;
+ else if (const uint64* theP = iAny.PGet<uint64>())
+ return *theP;
return null;
}
bool sQCoerceInt(const ZAny& iAny, int64& oVal)
{
- if (ZQ<int64> qInt64 = sQCoerceInt(iAny))
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
{
- oVal = qInt64.Get();
+ oVal = *theQ;
return true;
}
return false;
@@ -127,15 +127,15 @@
int64 sDCoerceInt(int64 iDefault, const ZAny& iAny)
{
- if (ZQ<int64> qInt = sQCoerceInt(iAny))
- return qInt.Get();
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
+ return *theQ;
return iDefault;
}
int64 sCoerceInt(const ZAny& iAny)
{
- if (ZQ<int64> qInt = sQCoerceInt(iAny))
- return qInt.Get();
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
+ return *theQ;
return 0;
}
@@ -143,19 +143,19 @@
{
if (false)
{}
- else if (const float* theVal = iAny.PGet<float>())
- return *theVal;
- else if (const double* theVal = iAny.PGet<double>())
- return *theVal;
+ else if (const float* theP = iAny.PGet<float>())
+ return *theP;
+ else if (const double* theP = iAny.PGet<double>())
+ return *theP;
return null;
}
bool sQCoerceRat(const ZAny& iAny, double& oVal)
{
- if (ZQ<double> qDouble = sQCoerceRat(iAny))
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
{
- oVal = qDouble.Get();
+ oVal = *theQ;
return true;
}
return false;
@@ -163,15 +163,15 @@
double sDCoerceRat(double iDefault, const ZAny& iAny)
{
- if (ZQ<double> qDouble = sQCoerceRat(iAny))
- return qDouble.Get();
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
+ return *theQ;
return iDefault;
}
double sCoerceRat(const ZAny& iAny)
{
- if (ZQ<double> qDouble = sQCoerceRat(iAny))
- return qDouble.Get();
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
+ return *theQ;
return 0.0;
}
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -45,19 +45,6 @@
double sDCoerceRat(double iDefault, const ZAny& iAny);
double sCoerceRat(const ZAny& iAny);
-// Old names
-inline ZQ<double> sQCoerceReal(const ZAny& iAny)
- { return sQCoerceRat(iAny); }
-
-inline bool sQCoerceReal(const ZAny& iAny, double& oVal)
- { return sQCoerceRat(iAny, oVal); }
-
-inline double sDCoerceReal(double iDefault, const ZAny& iAny)
- { return sDCoerceRat(iDefault, iAny); }
-
-inline double sCoerceReal(const ZAny& iAny)
- { return sCoerceRat(iAny); }
-
} // namespace ZooLib
#endif // __ZUtil_Any_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -922,10 +922,7 @@
ZRef<ZYadR> iYadR, const ZStrimW& s)
{
if (iYadR)
- {
- Visitor_Writer theWriter(iInitialIndent, iOptions, s);
- iYadR->Accept(theWriter);
- }
+ iYadR->Accept(Visitor_Writer(iInitialIndent, iOptions, s));
}
} // namespace ZYad_JSON
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -80,7 +80,7 @@
{
oVal = theQ.Get();
}
- else if (ZQ<double> theQ = sQCoerceReal(iVal))
+ else if (ZQ<double> theQ = sQCoerceRat(iVal))
{
oVal = theQ.Get();
}
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -375,7 +375,7 @@
s.Writef("%lld", asInt64);
s.End("integer");
}
- else if (sQCoerceReal(iVal, asDouble))
+ else if (sQCoerceRat(iVal, asDouble))
{
s.Begin("real");
ZUtil_Strim::sWriteExact(s, asDouble);
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -592,7 +592,7 @@
s.Writef("%d", int(asInt64));
s.End("i4");
}
- else if (sQCoerceReal(iVal, asDouble))
+ else if (sQCoerceRat(iVal, asDouble))
{
s.Begin("double");
ZUtil_Strim::sWriteExact(s, asDouble);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
