made some inline ops non-inline; added comments and TODOs

7 files changed, 24 insertions, 17 deletions

diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index c694967d02c..1387312aa88 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -32,11 +32,6 @@ public:
     virtual void listen() = 0;
     virtual TransceiverPtr accept(int) = 0;
     virtual std::string toString() const = 0;
-
-protected:
-
-    Acceptor() { }
-    virtual ~Acceptor() { }
 };
 
 }
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index 084c68bcb7b..abd90f233c7 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -24,11 +24,6 @@ public:
     
     virtual TransceiverPtr connect(int) = 0;
     virtual std::string toString() const = 0;
-    
-protected:
-
-    Connector() { }
-    virtual ~Connector() { }
 };
 
 }
diff --git a/cpp/src/Ice/LoggerUtil.cpp b/cpp/src/Ice/LoggerUtil.cpp
index 9e8cf0ee36a..fd3fdd8085d 100644
--- a/cpp/src/Ice/LoggerUtil.cpp
+++ b/cpp/src/Ice/LoggerUtil.cpp
@@ -36,6 +36,12 @@ Ice::Warning::flush()
     _str.clear();
 }
 
+ostringstream&
+Ice::Warning::__str()
+{
+    return _str;
+}
+
 Warning&
 Ice::operator<<(Warning& out, ios_base& (*val)(ios_base&))
 {
@@ -64,6 +70,12 @@ Ice::Error::flush()
     _str.clear();
 }
 
+ostringstream&
+Ice::Error::__str()
+{
+    return _str;
+}
+
 Error&
 Ice::operator<<(Error& out, ios_base& (*val)(ios_base&))
 {
@@ -93,6 +105,12 @@ Ice::Trace::flush()
     _str.clear();
 }
 
+ostringstream&
+Ice::Trace::__str()
+{
+    return _str;
+}
+
 Trace&
 Ice::operator<<(Trace& out, ios_base& (*val)(ios_base&))
 {
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index c3c6aa4e35d..14124f4e1a5 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -527,7 +527,6 @@ IceInternal::ThreadPool::read(const EventHandlerPtr& handler)
     }
 }
 
-void
 IceInternal::ThreadPool::EventHandlerThread::EventHandlerThread(const ThreadPoolPtr& pool) :
     _pool(pool)
 {
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 36a67788943..d829efa73f4 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -76,7 +76,7 @@ private:
     {
     public:
 	
-	EventHandlerThread(const ThreadPoolPtr& pool) : _pool(pool) { }
+	EventHandlerThread(const ThreadPoolPtr&);
 	virtual void run();
 
     private:
@@ -84,6 +84,7 @@ private:
 	ThreadPoolPtr _pool;
     };
     friend class EventHandlerThread;
+
     std::vector<IceUtil::ThreadControl> _threads; // Control for all threads, running or not.
     int _threadNum; // Number of running threads.
     int _maxConnections; // Maximum number of connections. If set to zero, the number of connections is not limited.
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 1648abb2793..1e555cda850 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -33,11 +33,6 @@ public:
     virtual void write(Buffer&, int) = 0;
     virtual void read(Buffer&, int) = 0;
     virtual std::string toString() const = 0;
-    
-protected:
-
-    Transceiver() { }
-    virtual ~Transceiver() { }
 };
 
 }
diff --git a/cpp/src/IceUtil/OutputUtil.cpp b/cpp/src/IceUtil/OutputUtil.cpp
index 1eda98edc21..1c690ff5f88 100644
--- a/cpp/src/IceUtil/OutputUtil.cpp
+++ b/cpp/src/IceUtil/OutputUtil.cpp
@@ -60,6 +60,10 @@ IceUtil::OutputBase::OutputBase(const char* s) :
     open(s);
 }
 
+IceUtil::OutputBase::~OutputBase()
+{
+}
+
 void
 IceUtil::OutputBase::open(const char* s)
 {