6 files changed, 9 insertions, 43 deletions
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index c762add3ff1..d45d90149da 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -51,7 +51,6 @@ protected:
 
     BasicStream _is;
     BasicStream _os;
-
 };
 
 class ICE_API Incoming : public IncomingBase
@@ -62,8 +61,9 @@ public:
 
     void invoke();
 
-    BasicStream* is();
-    BasicStream* os();
+    // Inlined for speed optimization.
+    BasicStream* is() { return &_is; }
+    BasicStream* os() { return &_os; }
 };
 
 }
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index f2736a3d707..b325b985f4b 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -38,8 +38,9 @@ protected:
     void __exception(const ::std::exception&);
     void __exception();
 
-    BasicStream* __is();
-    BasicStream* __os();
+    // Inlined for speed optimization.
+    BasicStream* __is() { return &_is; }
+    BasicStream* __os() { return &_os; }
 
 private:
 
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index 691bbfe6bc1..73c33841aff 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -63,8 +63,9 @@ public:
     void finished(BasicStream&);
     void finished(const ::Ice::LocalException&);
 
-    BasicStream* is();
-    BasicStream* os();
+    // Inlined for speed optimization.
+    BasicStream* is() { return &_is; }
+    BasicStream* os() { return &_os; }
 
 private:
 
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 77140d1e6a5..0969df7488c 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -379,15 +379,3 @@ IceInternal::Incoming::invoke()
 
     __finishInvoke();
 }
-
-BasicStream*
-IceInternal::Incoming::is()
-{
-    return &_is;
-}
-
-BasicStream*
-IceInternal::Incoming::os()
-{
-    return &_os;
-}
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 476a7dbf23d..bddec360fde 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -184,18 +184,6 @@ IceInternal::IncomingAsync::__exception()
     __finishInvoke();
 }
 
-BasicStream*
-IceInternal::IncomingAsync::__is()
-{
-    return &_is;
-}
-
-BasicStream*
-IceInternal::IncomingAsync::__os()
-{
-    return &_os;
-}
-
 IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) :
     IncomingAsync(in)
 {
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index fb773895b89..a9725607a0c 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -386,15 +386,3 @@ IceInternal::Outgoing::finished(const LocalException& ex)
 	notify();
     }
 }
-
-BasicStream*
-IceInternal::Outgoing::is()
-{
-    return &_is;
-}
-
-BasicStream*
-IceInternal::Outgoing::os()
-{
-    return &_os;
-}