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

[SVN commits to the Hydra project]

Author: beagles
Date: Tue May 18 15:34:20 2010
New Revision: 621

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=621
Log:
Fixed:
 - bad write call
 - Win32 build issue
 - Removed unused local variable
 - Removed incorrect function call from BasicStream::addPreservedPatcher

Modified:
    ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h
    ice/branches/preserve-graphs/cpp/src/Ice/BasicStream.cpp
    ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp
    ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp

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=621&r1=620&r2=621
==============================================================================
--- ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h (original)
+++ ice/branches/preserve-graphs/cpp/include/Ice/SliceHolder.h Tue May 18 15:34:20 2010
@@ -45,7 +45,7 @@
 };
 
 typedef IceUtil::Handle<ObjectPatcher> ObjectPatcherPtr;
-typedef std::map<long, ObjectPatcherPtr> PreservedObjectMap;
+typedef std::map<Ice::Int, ObjectPatcherPtr> PreservedObjectMap;
 
 }
 

Modified: ice/branches/preserve-graphs/cpp/src/Ice/BasicStream.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/Ice/BasicStream.cpp?view=diff&rev=621&r1=620&r2=621
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/Ice/BasicStream.cpp (original)
+++ ice/branches/preserve-graphs/cpp/src/Ice/BasicStream.cpp Tue May 18 15:34:20 2010
@@ -2224,10 +2224,6 @@
     e.patchFunc = preservedPatcher;
     e.patchAddr = patchAddr;
     p->second.push_back(e);
-    //
-    // Not sure if this would actually work here, but *maybe* 
-    //
-    patchPointers(id, _currentReadEncaps->unmarshaledMap->end(), p);
 }
 
 void

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=621&r1=620&r2=621
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp (original)
+++ ice/branches/preserve-graphs/cpp/src/slice2cpp/Gen.cpp Tue May 18 15:34:20 2010
@@ -922,7 +922,7 @@
 	}
 	if(switchWrites)
 	{
-	    C << nl << "__os->write(idMap);";
+	    C << nl << "__writeObjectIdMap(__os, idMap);";
 	}
         C << nl << "__os->endWriteSlice();";
         if(base)

Modified: ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp?view=diff&rev=621&r1=620&r2=621
==============================================================================
--- ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp (original)
+++ ice/branches/preserve-graphs/cpp/test/Ice/slicing/objects/AllTests.cpp Tue May 18 15:34:20 2010
@@ -1543,7 +1543,7 @@
 	    test(t->innerObj->ic == "D8.innerObj.ic");
 	    */
 	}
-	catch(const Ice::Exception& ex)
+	catch(const Ice::Exception&)
 	{
 	    test(true);
 	}