summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java/Main.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2009-04-03 15:15:13 -0700
committerMark Spruiell <mes@zeroc.com>2009-04-03 15:15:13 -0700
commitb415955846ce0d5c2e0c283f897190ccd2c3616a (patch)
tree10daf6bb8a05edf5052a33f10ea16c73d8ae0d89 /cpp/src/slice2java/Main.cpp
parentBug 3465 - Remove _adapter members from test where unecessary (diff)
downloadice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.bz2
ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.tar.xz
ice-b415955846ce0d5c2e0c283f897190ccd2c3616a.zip
removing Java2 mapping
Diffstat (limited to 'cpp/src/slice2java/Main.cpp')
-rw-r--r--cpp/src/slice2java/Main.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 3016b42d3d5..b21e9d1a47d 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -160,24 +160,6 @@ main(int argc, char* argv[])
vector<string> v = opts.argVec("meta");
copy(v.begin(), v.end(), back_inserter(globalMetadata));
- //
- // Look for the Java2 metadata.
- //
- bool java2 = false;
- for(StringList::iterator p = globalMetadata.begin(); p != globalMetadata.end(); ++p)
- {
- if((*p) == "java:java2")
- {
- java2 = true;
- break;
- }
- }
-
- if(java2 && !listGenerated && !depend && !dependxml)
- {
- getErrorStream() << argv[0] << ": warning: The Java2 mapping is deprecated." << endl;
- }
-
bool caseSensitive = opts.isSet("case-sensitive");
if(args.empty())
@@ -357,7 +339,7 @@ main(int argc, char* argv[])
{
try
{
- Gen::writeChecksumClass(checksumClass, output, checksums, java2);
+ Gen::writeChecksumClass(checksumClass, output, checksums);
}
catch(const Slice::FileException& ex)
{