summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ArgVector.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/ArgVector.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/ArgVector.cpp')
-rw-r--r--cpp/src/Ice/ArgVector.cpp16
1 files changed, 8 insertions, 8 deletions
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)