summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Service.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-07-26 17:13:54 +0200
committerJose <jose@zeroc.com>2012-07-26 17:13:54 +0200
commitad088c09c2a5022eb12dbea4523242e05c5d7bdd (patch)
treecc69971ee6374439033067c698c5589f978864a7 /cpp/src/Ice/Service.cpp
parentvsadding - fix for update reverse dependencies (diff)
downloadice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.tar.bz2
ice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.tar.xz
ice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.zip
MinGW & Ruby-1.9 updates
Diffstat (limited to 'cpp/src/Ice/Service.cpp')
-rw-r--r--cpp/src/Ice/Service.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 3c5c8df8f85..196e31ae6b7 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -852,7 +852,16 @@ Ice::Service::main(int argc, char* const argv[], const InitializationData& initi
int
Ice::Service::main(int& argc, wchar_t* argv[], const InitializationData& initializationData)
{
+
+# ifdef __MINGW32__ // COMPILER FIX
+ //
+ // MinGW doesn't see the main overload if we don't create the temp args object here.
+ //
+ Ice::StringSeq args = Ice::argsToStringSeq(argc, argv, initializationData.stringConverter);
+ return main(args, initializationData);
+# else
return main(Ice::argsToStringSeq(argc, argv, initializationData.stringConverter), initializationData);
+# endif
}
#endif