Fixed Win32 build issues, IceStorm test failure

5 files changed, 7 insertions, 2 deletions

diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index 25852e35b0b..e07d378d7cc 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -740,6 +740,7 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, cons
 }
 
 CommunicatorObserverI::CommunicatorObserverI(const IceInternal::MetricsAdminIPtr& metrics) : 
+    _metrics(metrics),
     _connections(metrics, "Connection"),
     _dispatch(metrics, "Dispatch"),
     _invocations(metrics, "Invocation"),
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 523cf6186fe..9f363016a00 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -39,7 +39,7 @@ public:
     virtual Ice::Instrumentation::ObserverPtr getRemoteObserver(const Ice::ConnectionInfoPtr&, const Ice::EndpointPtr&);
 };
 
-class CommunicatorObserverI : public Ice::Instrumentation::CommunicatorObserver
+class ICE_API CommunicatorObserverI : public Ice::Instrumentation::CommunicatorObserver
 {
 public:
 
diff --git a/cpp/src/IceStorm/InstrumentationI.cpp b/cpp/src/IceStorm/InstrumentationI.cpp
index 7fce5cac6a7..ab7ed86ff0f 100644
--- a/cpp/src/IceStorm/InstrumentationI.cpp
+++ b/cpp/src/IceStorm/InstrumentationI.cpp
@@ -172,7 +172,7 @@ public:
             {
                 _id = _proxy->ice_toString();
             }
-            catch(const Ice::FixedProxyException& ex)
+            catch(const Ice::FixedProxyException&)
             {
                 _id = _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity());
             }
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 0390adbde8f..99bc6193441 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -32,6 +32,7 @@ OBJS		= NodeI.obj \
 		  IceStormInternal.obj \

 		  Instrumentation.obj \

 		  InstrumentationI.obj \

+		  Metrics.obj \

 		  Util.obj

 

 AOBJS		= Admin.obj \

diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 4733d93d296..d403cb67c1b 100755
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -90,6 +90,9 @@ toSubscriberState(Subscriber::SubscriberState s)
     case Subscriber::SubscriberStateError:
     case Subscriber::SubscriberStateReaped:
         return IceStorm::Instrumentation::SubscriberStateError;
+    default:
+        assert(false);
+        return IceStorm::Instrumentation::SubscriberStateError;
     }
 }