[hydra-commits] beagles: branch ice/preserve-graphs r627 - in /ice/branches/preserve-graphs: ...

[SVN commits to the Hydra project]

Author: beagles
Date: Wed May 19 12:05:07 2010
New Revision: 627

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=627
Log:
fix several windows build errors

Modified:
    ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h
    ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak
    ice/branches/preserve-graphs/cpp/src/Ice/SliceHolder.cpp
    ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp
    ice/branches/preserve-graphs/slice/Ice/Preserve.ice

Modified: ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h?view=diff&rev=627&r1=626&r2=627
==============================================================================
--- ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h (original)
+++ ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h Wed May 19 12:05:07 2010
@@ -15,7 +15,7 @@
     std::vector< ::Ice::Byte > slice;
 };
 
-void ICE_API updateObjectId(std::vector<Byte>&, const Int, const Int);
+void ICE_API updateObjectId(std::vector<Byte>&, const Ice::Int, const Ice::Int);
 
 //
 // The patcher allows us to dynamically instantiate a object handle so its address

Modified: ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak?view=diff&rev=627&r1=626&r2=627
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak (original)
+++ ice/branches/preserve-graphs/cpp/src/Ice/Makefile.mak Wed May 19 12:05:07 2010
@@ -19,6 +19,7 @@
                   Base64.obj \
 		  Buffer.obj \
 		  BasicStream.obj \
+		  Preserve.obj \
 		  SliceHolder.obj \
 		  BuiltinSequences.obj \
 		  CommunicatorI.obj \
@@ -173,6 +174,7 @@
 	-del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
 	-del /q Connection.cpp $(HDIR)\Connection.h
 	-del /q Current.cpp $(HDIR)\Current.h
+	-del /q Preserve.cpp $(HDIR)\Preserve.h
 	-del /q Endpoint.cpp $(HDIR)\Endpoint.h
 	-del /q EndpointF.cpp $(HDIR)\EndpointF.h
 	-del /q EndpointTypes.cpp $(HDIR)\EndpointTypes.h

Modified: ice/branches/preserve-graphs/cpp/src/Ice/SliceHolder.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/Ice/SliceHolder.cpp?view=diff&rev=627&r1=626&r2=627
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/Ice/SliceHolder.cpp (original)
+++ ice/branches/preserve-graphs/cpp/src/Ice/SliceHolder.cpp Wed May 19 12:05:07 2010
@@ -2,7 +2,7 @@
 #include <Ice/LocalException.h>
 
 void
-::Ice::updateObjectId(std::vector< ::Ice::Byte>& b, ::Ice::Int offset, Int id)
+::Ice::updateObjectId(std::vector< ::Ice::Byte>& b, Ice::Int offset, Ice::Int id)
 {
     if(offset + sizeof(id) > b.size())
     {

Modified: ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp?view=diff&rev=627&r1=626&r2=627
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp (original)
+++ ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp Wed May 19 12:05:07 2010
@@ -906,6 +906,7 @@
 	{
 	    C << nl << "::Ice::ObjectIdOffset offset;";
 	    C << nl << "::Ice::ObjectIdOffsets offsetSeq;";
+            C << nl << "offset.id = 0;";
 	}
         for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
         {
@@ -4415,6 +4416,7 @@
 	{
 	    C << nl << "::Ice::ObjectIdOffset offset;";
 	    C << nl << "::Ice::ObjectIdOffsets offsetSeq;";
+            C << nl << "offset.id = 0;";
 	}
 	for(q = dataMembers.begin(); q != dataMembers.end(); ++q)
 	{

Modified: ice/branches/preserve-graphs/slice/Ice/Preserve.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/slice/Ice/Preserve.ice?view=diff&rev=627&r1=626&r2=627
==============================================================================
--- ice/branches/preserve-graphs/slice/Ice/Preserve.ice (original)
+++ ice/branches/preserve-graphs/slice/Ice/Preserve.ice Wed May 19 12:05:07 2010
@@ -7,8 +7,8 @@
 {
     struct ObjectIdOffset
     {
-	long id;
-	long offset;
+	int id;
+	int offset;
     };
 
     sequence<ObjectIdOffset> ObjectIdOffsets;