diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-10-31 15:54:21 -0400 |
| commit | 107e03ea13e0eba9c33f120f0d95ac9fefc7dcad (patch) | |
| tree | 00191b7ccb83fe436ad61bdbb43b523f431c6698 /cpp/src/slice2cs/Main.cpp | |
| parent | Update 3.7 changelog (diff) | |
| download | ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.bz2 ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.tar.xz ice-107e03ea13e0eba9c33f120f0d95ac9fefc7dcad.zip | |
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
Diffstat (limited to 'cpp/src/slice2cs/Main.cpp')
| -rw-r--r-- | cpp/src/slice2cs/Main.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index 2268eb1fa0a..e9a18c20d6a 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -68,16 +68,18 @@ usage(const string& n) "-IDIR Put DIR in the include file search path.\n" "-E Print preprocessor output on stdout.\n" "--output-dir DIR Create files in the directory DIR.\n" - "--tie Generate TIE classes.\n" + "--tie Generate tie classes.\n" "--impl Generate sample implementations.\n" - "--impl-tie Generate sample TIE implementations.\n" + "--impl-tie Generate sample tie implementations.\n" "--depend Generate Makefile dependencies.\n" "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "-d, --debug Print debug messages.\n" - "--ice Allow reserved Ice prefix in Slice identifiers.\n" - "--underscore Allow underscores in Slice identifiers.\n" "--checksum Generate checksums for Slice definitions.\n" + "--ice Allow reserved Ice prefix in Slice identifiers\n" + " deprecated: use instead [[\"ice-prefix\"]] metadata.\n" + "--underscore Allow underscores in Slice identifiers\n" + " deprecated: use instead [[\"underscore\"]] metadata.\n" ; } @@ -309,12 +311,8 @@ compile(const vector<string>& argv) { try { - Gen gen(icecpp->getBaseName(), includePaths, output, impl, implTie); + Gen gen(icecpp->getBaseName(), includePaths, output, tie, impl, implTie); gen.generate(p); - if(tie) - { - gen.generateTie(p); - } if(impl) { gen.generateImpl(p); |