diff options
author | Mark Spruiell <mes@zeroc.com> | 2009-03-20 09:55:55 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2009-03-20 09:55:55 -0700 |
commit | d99bc460dcabd96c089deebf8a542036fe0edc8d (patch) | |
tree | c88bf3f9b2275c5564e99a6b20737635b1cb24a4 /cpp/src/Slice/FileTracker.cpp | |
parent | Added APL 2.0 exception (diff) | |
download | ice-d99bc460dcabd96c089deebf8a542036fe0edc8d.tar.bz2 ice-d99bc460dcabd96c089deebf8a542036fe0edc8d.tar.xz ice-d99bc460dcabd96c089deebf8a542036fe0edc8d.zip |
bug 3916 - slice2java --list-generated bug
Diffstat (limited to 'cpp/src/Slice/FileTracker.cpp')
-rw-r--r-- | cpp/src/Slice/FileTracker.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/Slice/FileTracker.cpp b/cpp/src/Slice/FileTracker.cpp index 5c8bb1be161..2d4ce2293e4 100644 --- a/cpp/src/Slice/FileTracker.cpp +++ b/cpp/src/Slice/FileTracker.cpp @@ -90,20 +90,23 @@ Slice::FileTracker::instance() } void -Slice::FileTracker::setSource(const string& source, const string& output, bool error) +Slice::FileTracker::setSource(const string& source) { _source = source; - _errors.insert(make_pair(source, output)); + pair<map<string, list<string> >::iterator, bool> p = _generated.insert(make_pair(source, list<string>())); + assert(p.second); + _curr = p.first; +} + +void +Slice::FileTracker::setOutput(const string& output, bool error) +{ + assert(!_source.empty()); + _errors.insert(make_pair(_source, output)); if(error) { _curr = _generated.end(); } - else - { - pair<map<string, list<string> >::iterator, bool> p = _generated.insert(make_pair(source, list<string>())); - assert(p.second); - _curr = p.first; - } } void |