summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-07-16 14:49:30 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-07-16 14:49:30 -0230
commit0236fa69aede6c603ff9c717574de96b03641616 (patch)
tree3f3cb0e99557224bf13641ee8cf4092af64b3446 /cpp
parentICE-6472 Added info test to JavaScript (diff)
downloadice-0236fa69aede6c603ff9c717574de96b03641616.tar.bz2
ice-0236fa69aede6c603ff9c717574de96b03641616.tar.xz
ice-0236fa69aede6c603ff9c717574de96b03641616.zip
Fixed slice2java --list-generated output to properly indicate error has occurred
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Slice/FileTracker.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp
index f94c0509b0f..fcf5060af5b 100644
--- a/cpp/src/Slice/FileTracker.cpp
+++ b/cpp/src/Slice/FileTracker.cpp
@@ -99,6 +99,7 @@ Slice::FileTracker::setOutput(const string& output, bool error)
_errors.insert(make_pair(_source, output));
if(error)
{
+ _generated.erase(_curr);
_curr = _generated.end();
}
}
@@ -128,7 +129,7 @@ Slice::FileTracker::cleanup()
{
#ifdef _WIN32
_unlink(p->first.c_str());
-#else
+#else
unlink(p->first.c_str());
#endif
}
@@ -136,7 +137,7 @@ Slice::FileTracker::cleanup()
{
#ifdef _WIN32
_rmdir(p->first.c_str());
-#else
+#else
rmdir(p->first.c_str());
#endif
}