Added slice2cppe and slice2javae to "all" target for VC++ and fixed

    Main.cpp for both to call parse() with the parameter that was removed
    with the change to disallow definitions at global scope.

3 files changed, 8 insertions, 14 deletions

diff --git a/cpp/all.dsw b/cpp/all.dsw
index 6f16939eeee..a1589e1fbd9 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -120,9 +120,6 @@ Package=<4>
     Project_Dep_Name slice2cpp

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name slice2cppe

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name html

     End Project Dependency

     Begin Project Dependency

@@ -258,9 +255,6 @@ Package=<4>
     Project_Dep_Name slice2java

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name slice2javae

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name thread

     End Project Dependency

     Begin Project Dependency

@@ -539,6 +533,12 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name mfcpatchC

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name slice2cppe

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name slice2javae

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -2391,9 +2391,6 @@ Package=<4>
     Project_Dep_Name slice2cpp

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name slice2cppe

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name glacier2

     End Project Dependency

     Begin Project Dependency

@@ -2466,9 +2463,6 @@ Package=<4>
     Project_Dep_Name slice2java

     End Project Dependency

     Begin Project Dependency

-    Project_Dep_Name slice2javae

-    End Project Dependency

-    Begin Project Dependency

     Project_Dep_Name slice2py

     End Project Dependency

     Begin Project Dependency

diff --git a/cpp/src/slice2cppe/Main.cpp b/cpp/src/slice2cppe/Main.cpp
index d60fc9032ef..3dd9e7ec820 100644
--- a/cpp/src/slice2cppe/Main.cpp
+++ b/cpp/src/slice2cppe/Main.cpp
@@ -173,7 +173,7 @@ main(int argc, char* argv[])
 	    }
 	
 	    UnitPtr u = Unit::createUnit(false, false, ice, caseSensitive);
-	    int parseStatus = u->parse(cppHandle, debug, false);
+	    int parseStatus = u->parse(cppHandle, debug);
 	
 	    if(!icecpp.close())
 	    {
diff --git a/cpp/src/slice2javae/Main.cpp b/cpp/src/slice2javae/Main.cpp
index cbbe476f91f..47d01d11993 100644
--- a/cpp/src/slice2javae/Main.cpp
+++ b/cpp/src/slice2javae/Main.cpp
@@ -171,7 +171,7 @@ main(int argc, char* argv[])
 	    }
 
 	    UnitPtr p = Unit::createUnit(false, false, ice, caseSensitive);
-	    int parseStatus = p->parse(cppHandle, debug, false);
+	    int parseStatus = p->parse(cppHandle, debug);
 
 	    if(!icecpp.close())
 	    {