7 files changed, 13 insertions, 6 deletions
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h
index 4db89e1b2a1..9655cce858b 100644
--- a/cpp/include/Ice/MetricsAdminI.h
+++ b/cpp/include/Ice/MetricsAdminI.h
@@ -39,11 +39,11 @@ template<typename T> class MetricsHelperT;
 namespace IceInternal
 {
 
-class MetricsMapI : public IceUtil::Shared
+class ICE_API MetricsMapI : public IceUtil::Shared
 {
 public:
 
-    class RegExp : public IceUtil::Shared
+    class ICE_API RegExp : public IceUtil::Shared
     {
     public:
         
@@ -100,7 +100,7 @@ protected:
 };
 typedef IceUtil::Handle<MetricsMapI> MetricsMapIPtr;
 
-class MetricsMapFactory : public Ice::LocalObject
+class ICE_API MetricsMapFactory : public Ice::LocalObject
 {
 public:
 
@@ -539,7 +539,8 @@ private:
 };
 typedef IceUtil::Handle<MetricsViewI> MetricsViewIPtr;
 
-class MetricsAdminI : public IceMX::MetricsAdmin, public Ice::PropertiesAdminUpdateCallback, private IceUtil::Mutex
+class ICE_API MetricsAdminI : public IceMX::MetricsAdmin, public Ice::PropertiesAdminUpdateCallback, 
+                              private IceUtil::Mutex
 {
 public:
 
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;
     }
 }
 
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py
index 7d66516563c..cbb63dd222f 100644
--- a/scripts/IceGridAdmin.py
+++ b/scripts/IceGridAdmin.py
@@ -139,6 +139,7 @@ def iceGridNodePropertiesOverride():
     #
     overrideOptions = ''
     for opt in shlex.split(TestUtil.getCommandLineProperties("", TestUtil.DriverConfig("server"))):
+       opt = opt.strip().replace("--", "")
        index = opt.find("=")
        if index == -1:
           overrideOptions += ("%s=1 ") % opt