fixes

4 files changed, 17 insertions, 9 deletions

diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 6d5744b9e36..4cf63c69810 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -679,13 +679,13 @@ Slice::ClassDecl::visit(ParserVisitor* visitor)
 Slice::ClassDecl::ClassDecl(const Container_ptr& container,
 			    const string& name,
 			    bool local,
-			    bool interface)
+			    bool intf)
     : Constructed(container, name),
       Type(container -> unit()),
       Contained(container, name),
       SyntaxTreeBase(container -> unit()),
       local_(local),
-      interface_(interface)
+      interface_(intf)
 {
 }
 
@@ -834,14 +834,14 @@ Slice::ClassDef::ClassDef(const Container_ptr& container,
 			  const ClassDef_ptr& base,
 			  const ClassList& implements,
 			  bool local,
-			  bool interface)
+			  bool intf)
     : Contained(container, name),
       Container(container -> unit()),
       SyntaxTreeBase(container -> unit()),
       base_(base),
       implements_(implements),
       local_(local),
-      interface_(interface)
+      interface_(intf)
 {
 }
 
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index f6cc63754fe..5ed171b93ca 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -10,8 +10,8 @@
 //
 // **********************************************************************
 
+#include <GrammerUtil.h> // Before Grammer.h, so that YYSTYPE is defined
 #include <Grammer.h>
-#include <GrammerUtil.h>
 
 using namespace std;
 using namespace Slice;
diff --git a/cpp/src/Slice/parser.dsp b/cpp/src/Slice/parser.dsp
index c24c6828219..ccb5f4e5716 100644
--- a/cpp/src/Slice/parser.dsp
+++ b/cpp/src/Slice/parser.dsp
@@ -96,6 +96,10 @@ SOURCE=.\Grammer.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\GrammerUtil.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\OutputUtil.cpp

 # End Source File

 # Begin Source File

@@ -120,6 +124,10 @@ SOURCE=.\Grammer.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\GrammerUtil.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\OutputUtil.h

 # End Source File

 # Begin Source File

diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index b50db295bcb..a32a8172314 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -112,7 +112,7 @@ Slice::Gen::generate(const Unit_ptr& unit)
 
     H << "\n#include <Ice/ProxyF.h>";
     H << "\n#include <Ice/ObjectF.h>";
-    H << "\n#include <Ice/IsLocalObjectF.h>";
+    H << "\n#include <Ice/LocalObjectF.h>";
     H << "\n#include <Ice/Native.h>";
     if(unit -> hasProxies())
     {
@@ -120,11 +120,11 @@ Slice::Gen::generate(const Unit_ptr& unit)
 	H << "\n#include <Ice/Object.h>";
 	H << "\n#include <Ice/Outgoing.h>";
 	H << "\n#include <Ice/Incoming.h>";
-	H << "\n#include <Ice/IsLocalException.h>";
+	H << "\n#include <Ice/LocalException.h>";
     }
     else
     {
-	H << "\n#include <Ice/IsLocalObject.h>";
+	H << "\n#include <Ice/LocalObject.h>";
 	C << "\n#include <Ice/Stream.h>";
     }
 
@@ -1042,7 +1042,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDef_ptr& p)
     else
     {
 	if(isLocal)
-	    baseS = "::Ice::IsLocalObject";
+	    baseS = "::Ice::LocalObject";
 	else
 	    baseS = "::Ice::Object";
     }