summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2005-07-15 17:32:54 +0000
committerMark Spruiell <mes@zeroc.com>2005-07-15 17:32:54 +0000
commited7e9e102db89b35ba7fdbeb545edb2b7ea41a57 (patch)
treea6acd907b59e9a70b9283598f3eaf8066822b114 /cpp/src
parentadd some status message capability (diff)
downloadice-ed7e9e102db89b35ba7fdbeb545edb2b7ea41a57.tar.bz2
ice-ed7e9e102db89b35ba7fdbeb545edb2b7ea41a57.tar.xz
ice-ed7e9e102db89b35ba7fdbeb545edb2b7ea41a57.zip
show Ice-E version for -v
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/slice2javae/Gen.cpp4
-rw-r--r--cpp/src/slice2javae/Gen.h6
-rw-r--r--cpp/src/slice2javae/Main.cpp2
3 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/slice2javae/Gen.cpp b/cpp/src/slice2javae/Gen.cpp
index 59cdcf93082..8aee168e67b 100644
--- a/cpp/src/slice2javae/Gen.cpp
+++ b/cpp/src/slice2javae/Gen.cpp
@@ -76,9 +76,7 @@ Slice::JavaEOutput::printHeader()
print(header);
print("\n// Ice-E version ");
- // TODO: Avoid hard coded version?
- //print(ICE_STRING_VERSION);
- print("1.0.0");
+ print(ICEE_STRING_VERSION);
}
Slice::JavaVisitor::JavaVisitor(const string& dir) :
diff --git a/cpp/src/slice2javae/Gen.h b/cpp/src/slice2javae/Gen.h
index ab945bed3c3..0767b234093 100644
--- a/cpp/src/slice2javae/Gen.h
+++ b/cpp/src/slice2javae/Gen.h
@@ -13,6 +13,12 @@
#include <Slice/Parser.h>
#include <Slice/JavaUtil.h>
+//
+// The Ice-E version.
+//
+#define ICEE_STRING_VERSION "1.0.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICEE_INT_VERSION 10000 // AABBCC, with AA=major, BB=minor, CC=patch
+
namespace Slice
{
diff --git a/cpp/src/slice2javae/Main.cpp b/cpp/src/slice2javae/Main.cpp
index 1e54ce83284..9c2bf89a764 100644
--- a/cpp/src/slice2javae/Main.cpp
+++ b/cpp/src/slice2javae/Main.cpp
@@ -88,7 +88,7 @@ main(int argc, char* argv[])
}
if(opts.isSet("v") || opts.isSet("version"))
{
- cout << ICE_STRING_VERSION << endl;
+ cout << ICEE_STRING_VERSION << endl;
return EXIT_SUCCESS;
}
if(opts.isSet("D"))