Moved ArgVector to IceInternal

9 files changed, 30 insertions, 33 deletions

diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index ec67be9fa63..00526d7bc6d 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -10,7 +10,7 @@
 #include <Glacier2/Application.h>
 #include <Ice/Ice.h>
 #include <IceUtil/IceUtil.h>
-#include <IceUtil/ArgVector.h>
+#include <Ice/ArgVector.h>
 
 using namespace std;
 using namespace Ice;
@@ -209,7 +209,7 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
                 }
 
                 _category = _router->getCategoryForClient();
-                IceUtilInternal::ArgVector a(args);
+                IceInternal::ArgVector a(args);
                 status = runWithSession(a.argc, a.argv);
             }
         }
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index ea9b3588d67..0d817c55ada 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -11,7 +11,7 @@
 #include <Ice/LoggerI.h>
 #include <Ice/LoggerUtil.h>
 #include <IceUtil/CtrlCHandler.h>
-#include <IceUtil/ArgVector.h>
+#include <Ice/ArgVector.h>
 
 #ifdef _WIN32
 const DWORD SIGHUP = CTRL_LOGOFF_EVENT;
@@ -21,6 +21,7 @@ const DWORD SIGHUP = CTRL_LOGOFF_EVENT;
 
 using namespace std;
 using namespace Ice;
+using namespace IceInternal;
 using namespace IceUtil;
 using namespace IceUtilInternal;
 
diff --git a/cpp/src/Ice/ArgVector.cpp b/cpp/src/Ice/ArgVector.cpp
index 11d6bc3a722..e6bd418d780 100644
--- a/cpp/src/Ice/ArgVector.cpp
+++ b/cpp/src/Ice/ArgVector.cpp
@@ -7,10 +7,10 @@
 //
 // **********************************************************************
 
-#include <IceUtil/ArgVector.h>
+#include <Ice/ArgVector.h>
 #include <cstring>
 
-IceUtilInternal::ArgVector::ArgVector(int argc, const char* const argv[])
+IceInternal::ArgVector::ArgVector(int argc, const char* const argv[])
 {
     assert(argc >= 0);
     _args.resize(argc);
@@ -21,20 +21,20 @@ IceUtilInternal::ArgVector::ArgVector(int argc, const char* const argv[])
     setupArgcArgv();
 }
 
-IceUtilInternal::ArgVector::ArgVector(const ::std::vector< ::std::string>& vec)
+IceInternal::ArgVector::ArgVector(const ::std::vector< ::std::string>& vec)
 {
     _args = vec;
     setupArgcArgv();
 }
 
-IceUtilInternal::ArgVector::ArgVector(const ArgVector& rhs)
+IceInternal::ArgVector::ArgVector(const ArgVector& rhs)
 {
     _args = rhs._args;
     setupArgcArgv();
 }
 
-IceUtilInternal::ArgVector&
-IceUtilInternal::ArgVector::operator=(const ArgVector& rhs)
+IceInternal::ArgVector&
+IceInternal::ArgVector::operator=(const ArgVector& rhs)
 {
     delete[] argv;
     argv = 0;
@@ -43,13 +43,13 @@ IceUtilInternal::ArgVector::operator=(const ArgVector& rhs)
     return *this;
 }
 
-IceUtilInternal::ArgVector::~ArgVector()
+IceInternal::ArgVector::~ArgVector()
 {
     delete[] argv;
 }
 
 void
-IceUtilInternal::ArgVector::setupArgcArgv()
+IceInternal::ArgVector::setupArgcArgv()
 {
     argc = static_cast<int>(_args.size());
     if((argv = new char*[argc + 1]) == 0)
diff --git a/cpp/src/IceUtil/ArgVector.h b/cpp/src/Ice/ArgVector.h
index 0648112f7ad..bda5724ab1b 100644
--- a/cpp/src/IceUtil/ArgVector.h
+++ b/cpp/src/Ice/ArgVector.h
@@ -7,14 +7,14 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_ARGVECTOR_H
-#define ICE_UTIL_ARGVECTOR_H
+#ifndef ICE_ARGVECTOR_H
+#define ICE_ARGVECTOR_H
 
-#include <IceUtil/Config.h>
+#include <Ice/Config.h>
 #include <vector>
 #include <string>
 
-namespace IceUtilInternal
+namespace IceInternal
 {
 
 class ICE_API ArgVector
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 42272b3ca83..87b1926f5f5 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/ArgVector.h>
+#include <Ice/ArgVector.h>
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/CommunicatorI.h>
 #include <Ice/PropertiesI.h>
@@ -324,7 +324,7 @@ Ice::initialize(int& argc, const wchar_t* argv[], ICE_CONFIG_FILE_STRING configF
 Ice::CommunicatorPtr
 Ice::initialize(StringSeq& args, const InitializationData& initializationData, int version)
 {
-    IceUtilInternal::ArgVector av(args);
+    IceInternal::ArgVector av(args);
     CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData, version);
     args = argsToStringSeq(av.argc, av.argv);
     return communicator;
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)
     {
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index eac4e13761a..01e9e4a8703 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/ArgVector.h>
+#include <Ice/ArgVector.h>
 #include <IceUtil/FileUtil.h>
 #include <Ice/Ice.h>
 #include <IceGrid/Activator.h>
@@ -651,8 +651,8 @@ Activator::activate(const string& name,
     //
     // Convert to standard argc/argv.
     //
-    IceUtilInternal::ArgVector av(args);
-    IceUtilInternal::ArgVector env(envs);
+    IceInternal::ArgVector av(args);
+    IceInternal::ArgVector env(envs);
 
     //
     // Current directory
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
index a9a35a7c3d9..3ec98925a9b 100644
--- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -143,9 +143,8 @@
     <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" />
     <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" />
-    <ClInclude Include="..\..\ArgVector.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
index 43502f24fac..a4000c5cfc3 100644
--- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -179,11 +179,8 @@
     <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ArgVector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\IceUtil\ConsoleUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>