6 files changed, 1 insertions, 47 deletions
diff --git a/cpp/src/IceStorm/Flusher.cpp b/cpp/src/IceStorm/Flusher.cpp
index 1c5559bb05f..9d6952ab5fe 100644
--- a/cpp/src/IceStorm/Flusher.cpp
+++ b/cpp/src/IceStorm/Flusher.cpp
@@ -20,9 +20,6 @@
 using namespace IceStorm;
 using namespace std;
 
-void IceInternal::incRef(Flusher* p) { p->__incRef(); }
-void IceInternal::decRef(Flusher* p) { p->__decRef(); }
-
 namespace IceStorm
 {
 
diff --git a/cpp/src/IceStorm/FlusherF.h b/cpp/src/IceStorm/FlusherF.h
index efebb7777c9..bd2a0cfec17 100644
--- a/cpp/src/IceStorm/FlusherF.h
+++ b/cpp/src/IceStorm/FlusherF.h
@@ -21,15 +21,4 @@ typedef IceUtil::Handle<Flusher> FlusherPtr;
 
 } // End namespace IceStorm
 
-//
-// This is necessary so that FlusherPtr can be forward declared
-//
-namespace IceInternal
-{
-
-void incRef(IceStorm::Flusher*);
-void decRef(IceStorm::Flusher*);
-
-} // End namespace IceInternal
-
 #endif
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 5831f0a9a4f..402d664da03 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -17,10 +17,6 @@
 using namespace IceStorm;
 using namespace std;
 
-// TODO:
-//void IceInternal::incRef(Subscriber* p) { p->__incRef(); }
-//void IceInternal::decRef(Subscriber* p) { p->__decRef(); }
-
 Subscriber::Subscriber(const Ice::LoggerPtr& logger, const TraceLevelsPtr& traceLevels, const FlusherPtr& flusher,
 		       const QoS& qos, const Ice::ObjectPrx& obj)
     : _logger(logger),
diff --git a/cpp/src/IceStorm/SubscriberF.h b/cpp/src/IceStorm/SubscriberF.h
index 5a8ef6ebfc4..b5d247a0a6a 100644
--- a/cpp/src/IceStorm/SubscriberF.h
+++ b/cpp/src/IceStorm/SubscriberF.h
@@ -22,18 +22,4 @@ typedef IceUtil::Handle<Subscriber> SubscriberPtr;
 
 } // End namespace IceStorm
 
-//TODO:
-#ifdef never
-//
-// This is necessary so that SubscriberPtr can be forward declared
-//
-namespace IceInternal
-{
-
-void incRef(IceStorm::Subscriber*);
-void decRef(IceStorm::Subscriber*);
-
-} // End namespace IceInternal
-#endif
-
 #endif
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index 55433817643..094ec4a41a0 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -14,9 +14,6 @@
 using namespace std;
 using namespace IceStorm;
 
-void IceInternal::incRef(TraceLevels* p) { p->__incRef(); }
-void IceInternal::decRef(TraceLevels* p) { p->__decRef(); }
-
 TraceLevels::TraceLevels(const Ice::PropertiesPtr& properties) :
     topicMgr(0),
     topicMgrCat("TopicManager"),
diff --git a/cpp/src/IceStorm/TraceLevelsF.h b/cpp/src/IceStorm/TraceLevelsF.h
index b42b44efaa3..a7a03b249d2 100644
--- a/cpp/src/IceStorm/TraceLevelsF.h
+++ b/cpp/src/IceStorm/TraceLevelsF.h
@@ -17,19 +17,8 @@ namespace IceStorm
 {
 
 class TraceLevels;
-typedef IceInternal::Handle<TraceLevels> TraceLevelsPtr;
+typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr;
 
 } // End namespace IceStorm
 
-//
-// This is necessary so that TraceLevelsPtr can be forward declared
-//
-namespace IceInternal
-{
-
-void incRef(IceStorm::TraceLevels*);
-void decRef(IceStorm::TraceLevels*);
-
-} // End namespace IceInternal
-
 #endif