fixes

3 files changed, 16 insertions, 13 deletions

diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index 592545ddad7..35751e9865b 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -43,12 +43,10 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s)
 
     if (identity.empty())
     {
-	cout << "read empty identity" << endl;
 	return 0;
     }
     else
     {
-	cout << "read identity " << identity << endl;
 	ReferencePtr reference = new Reference(identity, s);
 	return referenceToProxy(reference);
     }
@@ -67,13 +65,11 @@ IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s)
 {
     if (proxy)
     {
-	cout << "wrote identity " << proxy->__reference()->identity << endl;
 	s->write(proxy->__reference()->identity);
 	proxy->__reference()->streamWrite(s);
     }
     else
     {
-	cout << "wrote empty identity" << endl;
 	s->write("");
     }
 }
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index a1e4c2a0fa5..5fbc4d52ad6 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -28,7 +28,8 @@ IceInternal::Reference::Reference(const InstancePtr& inst, const string& ident,
     mode(md),
     secure(sec),
     origEndpoints(origEndpts),
-    endpoints(endpts)
+    endpoints(endpts),
+    hashValue(0)
 {
     calcHashValue();
 }
@@ -36,7 +37,8 @@ IceInternal::Reference::Reference(const InstancePtr& inst, const string& ident,
 IceInternal::Reference::Reference(const InstancePtr& inst, const string& str) :
     instance(inst),
     mode(ModeTwoway),
-    secure(false)
+    secure(false),
+    hashValue(0)
 {
     const string delim = " \t\n\r";
 
@@ -244,7 +246,8 @@ IceInternal::Reference::Reference(const string& ident, BasicStream* s) :
     instance(s->instance()),
     identity(ident),
     mode(ModeTwoway),
-    secure(false)
+    secure(false),
+    hashValue(0)
 {
     //
     // Don't read the identity here. Operations calling this
@@ -304,12 +307,12 @@ IceInternal::Reference::streamWrite(BasicStream* s) const
     // write the identity.
     //
 
-//    s->write(facet);
-
-//    s->write(static_cast<Byte>(mode));
-
-//    s->write(secure);
-
+    s->write(facet);
+    
+    s->write(static_cast<Byte>(mode));
+    
+    s->write(secure);
+    
     vector<EndpointPtr>::const_iterator p;
 
     s->write(Ice::Int(origEndpoints.size()));
diff --git a/cpp/src/IcePack/icepack.dsp b/cpp/src/IcePack/icepack.dsp
index 763996e7a9f..22b84553e37 100644
--- a/cpp/src/IcePack/icepack.dsp
+++ b/cpp/src/IcePack/icepack.dsp
@@ -128,6 +128,7 @@ SOURCE=..\..\slice\IcePack\Admin.ice
 

 !IF  "$(CFG)" == "IcePack - Win32 Release"

 

+USERDEP__ADMIN="../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=..\..\slice\IcePack\Admin.ice

 

@@ -146,6 +147,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

 

+USERDEP__ADMIN="../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=..\..\slice\IcePack\Admin.ice

 

@@ -171,6 +173,7 @@ SOURCE=..\..\slice\IcePack\AdminF.ice
 

 !IF  "$(CFG)" == "IcePack - Win32 Release"

 

+USERDEP__ADMINF="../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=..\..\slice\IcePack\AdminF.ice

 

@@ -184,6 +187,7 @@ InputPath=..\..\slice\IcePack\AdminF.ice
 

 !ELSEIF  "$(CFG)" == "IcePack - Win32 Debug"

 

+USERDEP__ADMINF="../../bin/slice2cpp.exe"	

 # Begin Custom Build

 InputPath=..\..\slice\IcePack\AdminF.ice