summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-10-20 11:40:05 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-10-20 11:40:05 -0230
commitb51469b41167fb86ae2059a15cf0475c53fdda7b (patch)
treefc85d6ca2efd89c67e1e4e7438f437c3e08313f4 /cpp/src/slice2java
parentFixed (ICE-5695) - IceSSL: misleading exception (diff)
downloadice-b51469b41167fb86ae2059a15cf0475c53fdda7b.tar.bz2
ice-b51469b41167fb86ae2059a15cf0475c53fdda7b.tar.xz
ice-b51469b41167fb86ae2059a15cf0475c53fdda7b.zip
Down with ant. From the gradle to the grave.
Diffstat (limited to 'cpp/src/slice2java')
-rw-r--r--cpp/src/slice2java/Main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 41fdf0bde81..fffbf834946 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -58,7 +58,7 @@ void
usage(const char* n)
{
getErrorStream() << "Usage: " << n << " [options] slice-files...\n";
- getErrorStream() <<
+ getErrorStream() <<
"Options:\n"
"-h, --help Show this message.\n"
"-v, --version Display the Ice version.\n"
@@ -294,7 +294,7 @@ compile(int argc, char* argv[])
{
p->destroy();
return EXIT_FAILURE;
- }
+ }
if(parseStatus == EXIT_FAILURE)
{
@@ -375,7 +375,7 @@ compile(int argc, char* argv[])
cout << "</dependencies>\n";
}
- if(status == EXIT_SUCCESS && !checksumClass.empty())
+ if(status == EXIT_SUCCESS && !checksumClass.empty() && !dependxml)
{
try
{