[hydra-commits] kpfleming: branch techdemo/kpfleming/slicing r567 - /techdemo/team/kpfleming/...

[SVN commits to the Hydra project]

Author: kpfleming
Date: Thu Apr  8 17:46:01 2010
New Revision: 567

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=567
Log:
make it actually work...

Modified:
    techdemo/team/kpfleming/slicing/objects/AllTests.cpp
    techdemo/team/kpfleming/slicing/objects/TestI.cpp

Modified: techdemo/team/kpfleming/slicing/objects/AllTests.cpp
URL: https://origsvn.digium.com/svn-view/hydra/techdemo/team/kpfleming/slicing/objects/AllTests.cpp?view=diff&rev=567&r1=566&r2=567
==============================================================================
--- techdemo/team/kpfleming/slicing/objects/AllTests.cpp (original)
+++ techdemo/team/kpfleming/slicing/objects/AllTests.cpp Thu Apr  8 17:46:01 2010
@@ -864,6 +864,7 @@
             BPtr b2 = b1->pb;
             test(b2);
             test(b2->sb == "D3.sb");
+	    cout << "returned object is of type " << b2->ice_id() << endl;
             test(b2->ice_id() == "::Test::B");  // Sliced by server
             test(b2->pb == b1);
             D3Ptr p3 = D3Ptr::dynamicCast(b2);

Modified: techdemo/team/kpfleming/slicing/objects/TestI.cpp
URL: https://origsvn.digium.com/svn-view/hydra/techdemo/team/kpfleming/slicing/objects/TestI.cpp?view=diff&rev=567&r1=566&r2=567
==============================================================================
--- techdemo/team/kpfleming/slicing/objects/TestI.cpp (original)
+++ techdemo/team/kpfleming/slicing/objects/TestI.cpp Thu Apr  8 17:46:01 2010
@@ -11,14 +11,15 @@
 #include <Ice/Ice.h>
 #include <sstream>
 
+using namespace std;
 using namespace Test;
 
 class BPreserverFactory : public Ice::ObjectFactory
 {
 public:
-	virtual Ice::ObjectPtr create(const std::string& type) {
-		std::cout << __FUNCTION__ << " returning object requested for type " << type << std::endl << std::flush;
-		return new B();
+	virtual Ice::ObjectPtr create(const string& type) {
+		cout << __FUNCTION__ << " returning object requested for type " << type << endl;
+		return new BPreserver();
 	}
 	virtual void destroy() {}
 };
@@ -266,7 +267,7 @@
     BDict r;
     for(i = 0; i < 10; ++i)
     {
-        std::ostringstream s;
+        ostringstream s;
         s << "D1." << i * 20;
         D1Ptr d1 = new D1;
         d1->sb = s.str();
@@ -365,6 +366,5 @@
 BPreserver::__read(IceInternal::BasicStream* stream, bool rid)
 {
 	stream->readSkippedSliceBlob(__skippedSlices);
-	std::cout << __FUNCTION__ << " got blob of length " << __skippedSlices.size() << std::endl << std::flush;
 	B::__read(stream, rid);
 }