Replaced slice compiler options --ice, --underscore and --dll-export by

global metadata directives (ice-prefix, underscore, cpp:dll-export:SYMBOL and objc:dll-export:SYMBOL)
Added new cs:tie and java:tie metadata

1 files changed, 7 insertions, 12 deletions

diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h
index c03d491f380..a55841a43c9 100644
--- a/cpp/src/slice2java/GenCompat.h
+++ b/cpp/src/slice2java/GenCompat.h
@@ -127,11 +127,11 @@ public:
     GenCompat(const std::string&,
               const std::string&,
               const std::vector<std::string>&,
-              const std::string&);
+              const std::string&,
+              bool);
     ~GenCompat();
 
     void generate(const UnitPtr&);
-    void generateTie(const UnitPtr&);
     void generateImpl(const UnitPtr&);
     void generateImplTie(const UnitPtr&);
 
@@ -142,6 +142,7 @@ private:
     std::string _base;
     std::vector<std::string> _includePaths;
     std::string _dir;
+    bool _tie;
 
     class OpsVisitor : public JavaCompatVisitor
     {
@@ -155,15 +156,6 @@ private:
         void writeOperations(const ClassDefPtr&, bool);
     };
 
-    class TieVisitor : public JavaCompatVisitor
-    {
-    public:
-
-        TieVisitor(const std::string&);
-
-        virtual bool visitClassDefStart(const ClassDefPtr&);
-    };
-
     class PackageVisitor : public JavaCompatVisitor
     {
     public:
@@ -253,9 +245,12 @@ private:
     {
     public:
 
-        DispatcherVisitor(const std::string&);
+        DispatcherVisitor(const std::string&, bool);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
+
+    private:
+        bool _tie;
     };
 
     class BaseImplVisitor : public JavaCompatVisitor