[ZooLib-checkins] SF.net SVN: zoolib:[2691] trunk/zoolib/source/cxx

[<ag...@us...>]

Revision: 2691
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2691&view=rev
Author:   agreen
Date:     2012-01-26 18:22:12 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
More fiddling around with DynNonConst, conforming to ZRef::DynamicCast.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
    trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
    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_Embed.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
    trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
    trunk/zoolib/source/cxx/zoolib/ZExpr.cpp
    trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
    trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
    trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
    trunk/zoolib/source/cxx/zoolib/ZYad.cpp
    trunk/zoolib/source/cxx/zoolib/zconfigl.h

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:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -174,7 +174,7 @@
 
 void Source_Union::Proxy::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Proxy* theVisitor = DynNonConst<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 = DynNonConst<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/zqe/ZQE_Expr_Rel_Search.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -49,20 +49,18 @@
 
 void Expr_Rel_Search::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Search* theVisitor =
-		DynNonConst<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 =
-		DynNonConst<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/zra/ZRA_Expr_Rel_Calc.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -66,7 +66,7 @@
 
 void Expr_Rel_Calc::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<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 = DynNonConst<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_Concrete.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -43,7 +43,7 @@
 
 void Expr_Rel_Concrete::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<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 = DynNonConst<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_Const.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -52,7 +52,7 @@
 
 void Expr_Rel_Const::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<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 = DynNonConst<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_Dee.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -45,7 +45,7 @@
 
 void Expr_Rel_Dee::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<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 = DynNonConst<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_Difference.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -49,14 +49,10 @@
 void Expr_Rel_Difference::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
 	{
 	if (Visitor_Expr_Rel_Difference* theVisitor =
-		DynNonConst<Visitor_Expr_Rel_Difference*>(&iVisitor))
-		{
-		this->Accept_Expr_Rel_Difference(*theVisitor);
-		}
+		DynNonConst<Visitor_Expr_Rel_Difference>(&iVisitor))
+		{ this->Accept_Expr_Rel_Difference(*theVisitor); }
 	else
-		{
-		inherited::Accept_Expr_Op2(iVisitor);
-		}
+		{ inherited::Accept_Expr_Op2(iVisitor); }
 	}
 
 ZRef<Expr_Rel> Expr_Rel_Difference::Self()

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:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -45,7 +45,7 @@
 
 void Expr_Rel_Dum::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<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 = DynNonConst<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_Embed.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -54,7 +54,7 @@
 
 void Expr_Rel_Embed::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<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 = DynNonConst<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_Intersect.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -48,15 +48,10 @@
 
 void Expr_Rel_Intersect::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Intersect* theVisitor =
-		dynamic_cast<Visitor_Expr_Rel_Intersect*>(&iVisitor))
-		{
+	if (Visitor_Expr_Rel_Intersect* theVisitor = DynNonConst<Visitor_Expr_Rel_Intersect>(&iVisitor))
 		this->Accept_Expr_Rel_Intersect(*theVisitor);
-		}
 	else
-		{
 		inherited::Accept_Expr_Op2(iVisitor);
-		}
 	}
 
 ZRef<Expr_Rel> Expr_Rel_Intersect::Self()

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:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -48,7 +48,7 @@
 
 void Expr_Rel_Product::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<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 = DynNonConst<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_Project.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -52,7 +52,7 @@
 
 void Expr_Rel_Project::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<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 = DynNonConst<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_Rename.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -61,7 +61,7 @@
 
 void Expr_Rel_Rename::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<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 = DynNonConst<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_Restrict.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -52,7 +52,7 @@
 
 void Expr_Rel_Restrict::Accept(const ZVisitor& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<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 = DynNonConst<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_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -48,7 +48,7 @@
 
 void Expr_Rel_Union::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
 	{
-	if (Visitor_Expr_Rel_Union* theVisitor = DynNonConst<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/ZExpr.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -27,7 +27,7 @@
 
 void ZExpr::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Expr* theVisitor = DynNonConst<ZVisitor_Expr*>(&iVisitor))
+	if (ZVisitor_Expr* theVisitor = DynNonConst<ZVisitor_Expr>(&iVisitor))
 		this->Accept_Expr(*theVisitor);
 	else
 		ZVisitee::Accept(iVisitor);

Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -43,7 +43,7 @@
 
 void ZExpr_Bool_True::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<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 = DynNonConst<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);
@@ -92,7 +92,7 @@
 
 void ZExpr_Bool_False::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<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 = DynNonConst<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);
@@ -136,7 +136,7 @@
 
 void ZExpr_Bool_Not::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<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 = DynNonConst<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);
@@ -180,7 +180,7 @@
 
 void ZExpr_Bool_And::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<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 = DynNonConst<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);
@@ -228,7 +228,7 @@
 
 void ZExpr_Bool_Or::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<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 = DynNonConst<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_ValPred.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -35,20 +35,18 @@
 
 void ZExpr_Bool_ValPred::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Expr_Bool_ValPred* theVisitor =
-		DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
-		{ this->Accept_Expr_Bool_ValPred(*theVisitor); }
+	if (ZVisitor_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 =
-		DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
-		{ this->Accept_Expr_Bool_ValPred(*theVisitor); }
+	if (ZVisitor_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_Op_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h	2012-01-26 18:22:12 UTC (rev 2691)
@@ -49,7 +49,7 @@
 // From ZVisitee
 	virtual void Accept(const ZVisitor& iVisitor)
 		{
-		if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<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,7 +58,7 @@
 // From ZExpr
 	virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
 		{
-		if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<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);
 			}
@@ -114,7 +114,7 @@
 // From ZVisitee
 	virtual void Accept(const ZVisitor& iVisitor)
 		{
-		if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<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);
@@ -123,7 +123,7 @@
 // From ZExpr
 	virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
 		{
-		if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<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);
@@ -186,7 +186,7 @@
 // From ZVisitee
 	virtual void Accept(const ZVisitor& iVisitor)
 		{
-		if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<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);
@@ -195,7 +195,7 @@
 // From ZExpr
 	virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
 		{
-		if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<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);
@@ -261,7 +261,7 @@
 // From ZVisitee
 	virtual void Accept(const ZVisitor& iVisitor)
 		{
-		if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<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);
@@ -270,7 +270,7 @@
 // From ZExpr
 	virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
 		{
-		if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<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/ZYad.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad.cpp	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZYad.cpp	2012-01-26 18:22:12 UTC (rev 2691)
@@ -92,7 +92,7 @@
 
 void ZYadR::Accept(const ZVisitor& iVisitor)
 	{
-	if (ZVisitor_Yad* theVisitor = DynNonConst<ZVisitor_Yad*>(&iVisitor))
+	if (ZVisitor_Yad* theVisitor = DynNonConst<ZVisitor_Yad>(&iVisitor))
 		this->Accept_Yad(*theVisitor);
 	else
 		ZVisitee::Accept(iVisitor);

Modified: trunk/zoolib/source/cxx/zoolib/zconfigl.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/zconfigl.h	2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/zconfigl.h	2012-01-26 18:22:12 UTC (rev 2691)
@@ -334,17 +334,33 @@
 	{ return const_cast<T*>(iT); }
 
 template <class T>
+T* NonConst(T* iT)
+	{ return iT; }
+
+template <class T>
 T& NonConst(const T& iT)
 	{ return const_cast<T&>(iT); }
 
+template <class T>
+T& NonConst(T& iT)
+	{ return iT; }
+
 template <class P, class T>
-P DynNonConst(const T* iT)
-	{ return dynamic_cast<P>(NonConst(iT)); }
+P* DynNonConst(const T* iT)
+	{ return dynamic_cast<P*>(NonConst(iT)); }
 
 template <class P, class T>
-P DynNonConst(const T& iT)
-	{ return dynamic_cast<P>(NonConst(iT)); }
+P* DynNonConst(T* iT)
+	{ return dynamic_cast<P*>(iT); }
 
+template <class P, class T>
+P& DynNonConst(const T& iT)
+	{ return dynamic_cast<P&>(NonConst(iT)); }
+
+template <class P, class T>
+P& DynNonConst(T& iT)
+	{ return dynamic_cast<P&>(iT); }
+
 } // namespace ZooLib
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.