cleanup

1 files changed, 13 insertions, 3 deletions

diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index ef82ed084a5..c57edcd6bed 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -99,10 +99,12 @@ Slice::Gen::generate(const Parser_ptr& parser)
 	C << include_ << '/';
     C << base_ << ".h>";
 
+    H << "\n#include <Ice/ProxyF.h>";
+    H << "\n#include <Ice/ObjectF.h>";
+    H << "\n#include <Ice/LocalObjectF.h>";
+    H << "\n#include <Ice/Native.h>";
     if(parser -> hasProxies())
     {
-//	H << "\n#include <Ice/ProxyF.h>";
-//	H << "\n#include <Ice/ObjectF.h>";
 	H << "\n#include <Ice/Proxy.h>";
 	H << "\n#include <Ice/Object.h>";
 	H << "\n#include <Ice/Outgoing.h>";
@@ -111,7 +113,6 @@ Slice::Gen::generate(const Parser_ptr& parser)
     }
     else
     {
-//	H << "\n#include <Ice/LocalObjectF.h>";
 	H << "\n#include <Ice/LocalObject.h>";
 	C << "\n#include <Ice/Stream.h>";
     }
@@ -285,6 +286,15 @@ Slice::Gen::TypesVisitor::visitVector(const Vector_ptr& p)
     }
 }
 
+void
+Slice::Gen::TypesVisitor::visitNative(const Native_ptr& p)
+{
+    string name = p -> name();
+
+    H << sp;
+    H << nl << "typedef ::__IceNative::" << name << ' ' << name << ';';
+}
+
 Slice::Gen::ProxyDeclVisitor::ProxyDeclVisitor(Output& h, Output& c,
 					       const string& dllExport)
     : H(h), C(c), dllExport_(dllExport)