summaryrefslogtreecommitdiff
path: root/cpp/src/slice2php/Main.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2010-05-14 19:49:18 -0700
committerMark Spruiell <mes@zeroc.com>2010-05-14 19:49:18 -0700
commit4fcec92f1aa84346b73133b03984ebe33d138c9b (patch)
treefd9cb6d3fc0087163086d8964d852a239811ea40 /cpp/src/slice2php/Main.cpp
parentbug 4728 - slice2freezej fix (diff)
downloadice-4fcec92f1aa84346b73133b03984ebe33d138c9b.tar.bz2
ice-4fcec92f1aa84346b73133b03984ebe33d138c9b.tar.xz
ice-4fcec92f1aa84346b73133b03984ebe33d138c9b.zip
bug 4749 - duplicate Slice files cause slice2java to fail
Diffstat (limited to 'cpp/src/slice2php/Main.cpp')
-rw-r--r--cpp/src/slice2php/Main.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 19fbd3d98fa..d66a791af51 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -1625,6 +1625,15 @@ compile(int argc, char* argv[])
for(i = args.begin(); i != args.end(); ++i)
{
+ //
+ // Ignore duplicates.
+ //
+ vector<string>::iterator p = find(args.begin(), args.end(), *i);
+ if(p != i)
+ {
+ continue;
+ }
+
if(depend)
{
PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs);