Squashed commit of the following:

commit 9aa67a8862e402cb52276282b26a40422fae4adb
Author: Jose Gutierrez <jose@zeroc.com>
Date:   Tue Jan 27 19:25:22 2009 +0100

    Fixed 3374 --header-ext not work as intended.

1 files changed, 16 insertions, 0 deletions

diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index e3c1c9afc01..9cb699a205c 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -44,6 +44,20 @@ private:
 
     void writeExtraHeaders(::IceUtilInternal::Output&);
 
+
+    //
+    // Get the header extension defined in the global metadata for a given file
+    // if there isn't defined returns a empty string
+    //
+    std::string getHeaderExt(const std::string& file, const ModuleList& modules);
+
+    //
+    // Get the header extension defined in the global metadata for the current 
+    // compiling file.
+    // if there isn't defined returns a empty string
+    //
+    std::string getHeaderExt(const ModuleList& modules);
+
     ::IceUtilInternal::Output H;
     ::IceUtilInternal::Output C;
 
@@ -52,11 +66,13 @@ private:
 
     std::string _base;
     std::string _headerExtension;
+    std::string _implHeaderExtension;
     std::string _sourceExtension;
     std::vector<std::string> _extraHeaders;
     std::string _include;
     std::vector<std::string> _includePaths;
     std::string _dllExport;
+    std::string _dir;
     bool _impl;
     bool _checksum;
     bool _stream;