Better formatting of generated code

Fixed ice_id/ice_staticId implementation
Generate override with C++11 mapping

1 files changed, 16 insertions, 3 deletions

diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index 9207b428b50..024f50eae5f 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.h
@@ -352,15 +352,28 @@ struct StreamHelper<T, StreamHelperCategoryBuiltin>
     }
 };
 
+//
 // "helpers" for the StreamHelper<T, StreamHelperCategoryStruct[Class]> below
-// We generate specializations, which can be instantiated explicitly and exported from DLLs
+// slice2cpp generates specializations as needed
 //
 
 template<typename T, typename S>
-struct StreamWriter;
+struct StreamWriter
+{
+    static inline void write(S*, const T&)
+    {
+        // Default is to do write nothing
+    }
+};
 
 template<typename T, typename S>
-struct StreamReader;
+struct StreamReader
+{
+    static inline void read(S*, T&)
+    {
+        // Default is to read nothing
+    }
+};
 
 // Helper for structs
 template<typename T>