7 files changed, 84 insertions, 13 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 6139d5a1fbc..ec1ced5cbe8 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -51,12 +51,22 @@ public:
     void writeBlob(const std::vector<Ice::Byte>&);
     void readBlob(std::vector<Ice::Byte>&, Ice::Int);
 
-    void write(Ice::Byte v) { b.push_back(v); }
+    // Performance critical function inlined, as writing single bytes
+    // is used in many places in Ice code.
+    void write(Ice::Byte v)
+    {
+	b.push_back(v);
+    }
     void write(const std::vector<Ice::Byte>&);
     void read(Ice::Byte&);
     void read(std::vector<Ice::Byte>&);
 
-    void write(bool v) { b.push_back(static_cast<Ice::Byte>(v)); }
+    // Performance critical function inlined, as writing single bools
+    // is used in many places in Ice code.
+    void write(bool v)
+    {
+	b.push_back(static_cast<Ice::Byte>(v));
+    }
     void write(const std::vector<bool>&);
     void read(bool&);
     void read(std::vector<bool>&);
diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h
index 48606251459..a9a93cef5d9 100644
--- a/cpp/include/Ice/Buffer.h
+++ b/cpp/include/Ice/Buffer.h
@@ -20,6 +20,7 @@ class ICE_API Buffer : public ::IceUtil::noncopyable
 {
 public:
 
+    // TODO: Should not be inline, as this is not performance critical.
     Buffer()
     {
 	b.reserve(1000);
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 6ed6097cfe5..f92b4726dee 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -30,8 +30,13 @@
 // using namespace Ice;
 // using namespace IceInternal;
 //
-namespace Ice { }
-namespace IceInternal { }
+namespace Ice
+{
+}
+
+namespace IceInternal
+{
+}
 
 #if defined(WIN32)
 
@@ -55,6 +60,7 @@ typedef double Double;
 
 }
 
+// TODO: Should not be inline, this is not performance critical.
 inline int getSystemErrno() { return GetLastError(); }
 inline int getSocketErrno() { return WSAGetLastError(); }
 inline int getDNSErrno() { return WSAGetLastError(); }
@@ -78,6 +84,7 @@ typedef double Double;
 
 }
 
+// TODO: Should not be inline, this is not performance critical.
 inline int getSystemErrno() { return errno; }
 inline int getSocketErrno() { return errno; }
 extern int h_errno;
diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h
index 0d1bcd5c704..a6be07fdefd 100644
--- a/cpp/include/Ice/LocalObjectF.h
+++ b/cpp/include/Ice/LocalObjectF.h
@@ -13,7 +13,12 @@
 
 #include <Ice/Handle.h>
 
-namespace Ice { class LocalObject; }
+namespace Ice
+{
+
+class LocalObject;
+
+}
 
 namespace IceInternal
 {
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 6e1a2db514f..1444112da5c 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -25,7 +25,7 @@ public:
 
     void flush();
 
-    std::ostringstream& __str() { return _str; } // Don't use directly
+    std::ostringstream& __str(); // For internal use only. Don't use in your code.
 
 private:
 
@@ -52,7 +52,7 @@ public:
 
     void flush();
 
-    std::ostringstream& __str() { return _str; } // Don't use directly
+    std::ostringstream& __str(); // For internal use only. Don't use in your code.
 
 private:
 
@@ -79,7 +79,7 @@ public:
 
     void flush();
 
-    std::ostringstream& __str() { return _str; } // Don't use directly
+    std::ostringstream& __str(); // For internal use only. Don't use in your code.
 
 private:
 
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index f83efeadd1f..c2c3769743d 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -13,7 +13,12 @@
 
 #include <Ice/Handle.h>
 
-namespace Ice { class Object; }
+namespace Ice
+{
+
+class Object;
+
+}
 
 namespace IceInternal
 {
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index 57fdd96bbc1..ce1496a4bbc 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -13,10 +13,53 @@
 
 #include <Ice/ProxyHandle.h>
 
-namespace IceProxy { namespace Ice { class Object; } }
-namespace IceDelegate { namespace Ice { class Object; } }
-namespace IceDelegateM { namespace Ice { class Object; } }
-namespace IceDelegateD { namespace Ice { class Object; } }
+namespace IceProxy
+{
+
+namespace Ice
+{
+
+class Object;
+
+}
+
+}
+
+namespace IceDelegate
+{
+
+namespace Ice
+{
+
+class Object;
+
+}
+
+}
+
+namespace IceDelegateM
+{
+
+namespace Ice
+{
+
+class Object;
+
+}
+
+}
+
+namespace IceDelegateD
+{
+
+namespace Ice
+{
+
+class Object;
+
+}
+
+}
 
 namespace IceInternal
 {