C++11 mapping: InterfaceByValue simplification

1 files changed, 6 insertions, 8 deletions

diff --git a/cpp/include/Ice/InterfaceByValue.h b/cpp/include/Ice/InterfaceByValue.h
index b0ba02def8f..3f042bae2c1 100644
--- a/cpp/include/Ice/InterfaceByValue.h
+++ b/cpp/include/Ice/InterfaceByValue.h
@@ -26,7 +26,7 @@ public:
     virtual void
     __writeImpl(::IceInternal::BasicStream* __os) const
     {
-        __os->startWriteSlice(InterfaceTraits<T>::staticId, InterfaceTraits<T>::compactId, true);
+        __os->startWriteSlice(T::ice_staticId(), -1, true);
         __os->endWriteSlice();
     }
 
@@ -36,17 +36,15 @@ public:
         __is->startReadSlice();
         __is->endReadSlice();
     }
-
-    virtual const std::string&
-    ice_id() const
+    
+    virtual const std::string& ice_id() const
     {
-        return InterfaceTraits<T>::staticId;
+        return T::ice_staticId();
     }
 
-    static const std::string&
-    ice_staticId()
+    static const std::string& ice_staticId()
     {
-        return InterfaceTraits<T>::staticId;
+        return T::ice_staticId();
     }
 };