summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Service.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-03-28 11:15:18 -0400
committerBernard Normier <bernard@zeroc.com>2017-03-28 11:15:18 -0400
commit232397a680be8f6dc86d44199474ea00f3a6d13b (patch)
tree374025ce533d8a9cd2a624552a8b5fe2e8f99bdd /cpp/src/Ice/Service.cpp
parentFix (ICE-6724) - Scripts process termination on Windows (diff)
downloadice-232397a680be8f6dc86d44199474ea00f3a6d13b.tar.bz2
ice-232397a680be8f6dc86d44199474ea00f3a6d13b.tar.xz
ice-232397a680be8f6dc86d44199474ea00f3a6d13b.zip
Moved ArgVector to IceInternal
Diffstat (limited to 'cpp/src/Ice/Service.cpp')
-rw-r--r--cpp/src/Ice/Service.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 91d0fee585f..da91bb24c85 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -12,7 +12,7 @@
#include <IceUtil/Thread.h>
#include <IceUtil/Monitor.h>
#include <IceUtil/Mutex.h>
-#include <IceUtil/ArgVector.h>
+#include <Ice/ArgVector.h>
#include <IceUtil/FileUtil.h>
#include <Ice/ConsoleUtil.h>
#include <Ice/StringConverter.h>
@@ -545,7 +545,7 @@ Ice::Service::main(int argc, const char* const argv[], const InitializationData&
_name = argv[0];
}
- IceUtilInternal::ArgVector av(argc, argv); // copy args
+ IceInternal::ArgVector av(argc, argv); // copy args
//
// We parse the properties here to extract Ice.ProgramName and
@@ -741,7 +741,7 @@ Ice::Service::main(int argc, const wchar_t* const argv[], const InitializationDa
int
Ice::Service::main(const StringSeq& args, const InitializationData& initData, int version)
{
- IceUtilInternal::ArgVector av(args);
+ IceInternal::ArgVector av(args);
return main(av.argc, av.argv, initData, version);
}
@@ -780,7 +780,7 @@ int
Ice::Service::run(int argc, const wchar_t* const argv[], const InitializationData& initData, int version)
{
StringSeq args = Ice::argsToStringSeq(argc, argv);
- IceUtilInternal::ArgVector av(args);
+ IceInternal::ArgVector av(args);
return run(av.argc, av.argv, initData, version);
}
#endif
@@ -788,7 +788,7 @@ Ice::Service::run(int argc, const wchar_t* const argv[], const InitializationDat
int
Ice::Service::run(int argc, const char* const argv[], const InitializationData& initData, int version)
{
- IceUtilInternal::ArgVector av(argc, argv); // copy args
+ IceInternal::ArgVector av(argc, argv); // copy args
if(_service)
{