4 files changed, 106 insertions, 0 deletions

diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 97718dd9328..94c99dc646c 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -250,6 +250,9 @@ Slice::Gen::generate(const UnitPtr& p)
 
     H << "\n#include <Ice/UndefSysMacros.h>";
 
+    GlobalIncludeVisitor globalIncludeVisitor(H);
+    p->visit(&globalIncludeVisitor, false);
+
     printVersionCheck(H);
     printVersionCheck(C);
 
@@ -374,6 +377,36 @@ Slice::Gen::writeExtraHeaders(IceUtil::Output& out)
     }
 }
 
+Slice::Gen::GlobalIncludeVisitor::GlobalIncludeVisitor(Output& h) :
+    H(h), _finished(false)
+{
+}
+
+bool
+Slice::Gen::GlobalIncludeVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!_finished)
+    {
+        DefinitionContextPtr dc = p->definitionContext();
+        assert(dc);
+        StringList globalMetaData = dc->getMetaData();
+
+        static const string includePrefix = "cpp:include:";
+    
+        for(StringList::const_iterator q = globalMetaData.begin(); q != globalMetaData.end(); ++q)
+        {
+            string s = *q;
+            if(s.find(includePrefix) == 0)
+            {
+	        H << nl << "#include <" << s.substr(includePrefix.size()) << ">";
+            }
+        }
+	_finished = true;
+    }
+
+    return false;
+}
+
 Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c, const string& dllExport, bool stream) :
     H(h), C(c), _dllExport(dllExport), _stream(stream), _doneStaticSymbol(false)
 {
@@ -4702,6 +4735,11 @@ Slice::Gen::MetaDataVisitor::visitModuleStart(const ModulePtr& p)
         {
             if(s.find(prefix) == 0)
             {
+                string ss = s.substr(prefix.size());
+		if(ss.find("include:") == 0)
+		{
+		    continue;
+		}
                 cout << file << ": warning: ignoring invalid global metadata `" << s << "'" << endl;
             }
             _history.insert(s);
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index 3801640f75e..989c839255d 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -59,6 +59,21 @@ private:
     bool _checksum;
     bool _stream;
 
+    class GlobalIncludeVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+	GlobalIncludeVisitor(::IceUtil::Output&);
+
+	virtual bool visitModuleStart(const ModulePtr&);
+
+    private:
+
+	::IceUtil::Output& H;
+
+	bool _finished;
+    };
+
     class TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 52d18fddce3..64507411689 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -249,6 +249,9 @@ Slice::Gen::generate(const UnitPtr& p)
 
     H << "\n#include <IceE/UndefSysMacros.h>";
 
+    GlobalIncludeVisitor globalIncludeVisitor(H);
+    p->visit(&globalIncludeVisitor, false);
+
     printVersionCheck(H);
     printVersionCheck(C);
 
@@ -336,6 +339,36 @@ Slice::Gen::writeExtraHeaders(Output& out)
     }
 }
 
+Slice::Gen::GlobalIncludeVisitor::GlobalIncludeVisitor(Output& h) :
+    H(h), _finished(false)
+{
+}
+
+bool
+Slice::Gen::GlobalIncludeVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!_finished)
+    {
+        DefinitionContextPtr dc = p->definitionContext();
+        assert(dc);
+        StringList globalMetaData = dc->getMetaData();
+
+        static const string includePrefix = "cpp:include:";
+
+        for(StringList::const_iterator q = globalMetaData.begin(); q != globalMetaData.end(); ++q)
+        {
+            string s = *q;
+            if(s.find(includePrefix) == 0)
+            {
+                H << nl << "#include <" << s.substr(includePrefix.size()) << ">";
+            }
+        }
+        _finished = true;
+    }
+
+    return false;
+}
+
 Slice::Gen::TypesVisitor::TypesVisitor(Output& h, Output& c, const string& dllExport) :
     H(h), C(c), _dllExport(dllExport), _doneStaticSymbol(false)
 {
@@ -2980,6 +3013,11 @@ Slice::Gen::MetaDataVisitor::visitModuleStart(const ModulePtr& p)
         {
             if(s.find(prefix) == 0)
             {
+                string ss = s.substr(prefix.size());
+                if(ss.find("include:") == 0)
+                {
+                    continue;
+                }
 		cout << file << ": warning: ignoring invalid global metadata `" << s << "'" << endl;
             }
             _history.insert(s);
diff --git a/cpp/src/slice2cppe/Gen.h b/cpp/src/slice2cppe/Gen.h
index b1d9406a7ce..4e446743fe1 100644
--- a/cpp/src/slice2cppe/Gen.h
+++ b/cpp/src/slice2cppe/Gen.h
@@ -61,6 +61,21 @@ private:
     std::string _dllExport;
     bool _impl;
 
+    class GlobalIncludeVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        GlobalIncludeVisitor(::IceUtil::Output&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+
+    private:
+
+        ::IceUtil::Output& H;
+
+        bool _finished;
+    };
+
     class TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor
     {
     public: