http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2719

Squashed commit of the following:

commit 5ff1fac3e73ef4fb3ac96a692812a849ff585ebc
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Tue Mar 18 01:27:20 2008 -0800

    Fixed the various && || warnings from gcc.

1 files changed, 11 insertions, 9 deletions

diff --git a/cpp/src/slice2sl/Gen.cpp b/cpp/src/slice2sl/Gen.cpp
index 516034513dc..f9f3538e32b 100755
--- a/cpp/src/slice2sl/Gen.cpp
+++ b/cpp/src/slice2sl/Gen.cpp
@@ -1520,7 +1520,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
         }
         _out << eb;
 
-        if(!base || base && !base->usesClasses())
+        if(!base || !base->usesClasses())
         {
             _out << sp << nl << "public override bool usesClasses__()";
             _out << sb;
@@ -3377,14 +3377,16 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p)
             string param = fixId(q->second);
             StructPtr st = StructPtr::dynamicCast(q->first);
             if(st)
-            if(isValueType(st))
-            {
-                _out << nl << param << " = new " << typeToString(q->first) << "();";
-            }
-            else
-            {
-                _out << nl << param << " = null;";
-            }
+	    {
+		if(isValueType(st))
+		{
+		    _out << nl << param << " = new " << typeToString(q->first) << "();";
+		}
+		else
+		{
+		    _out << nl << param << " = null;";
+		}
+	    }
             writeMarshalUnmarshalCode(_out, q->first, fixId(q->second), false, false, true);
         }
         if(ret)