diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-03-28 11:15:18 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-03-28 11:15:18 -0400 |
| commit | 232397a680be8f6dc86d44199474ea00f3a6d13b (patch) | |
| tree | 374025ce533d8a9cd2a624552a8b5fe2e8f99bdd /cpp/src/IceUtil | |
| parent | Fix (ICE-6724) - Scripts process termination on Windows (diff) | |
| download | ice-232397a680be8f6dc86d44199474ea00f3a6d13b.tar.bz2 ice-232397a680be8f6dc86d44199474ea00f3a6d13b.tar.xz ice-232397a680be8f6dc86d44199474ea00f3a6d13b.zip | |
Moved ArgVector to IceInternal
Diffstat (limited to 'cpp/src/IceUtil')
| -rw-r--r-- | cpp/src/IceUtil/ArgVector.h | 41 | ||||
| -rw-r--r-- | cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj | 5 | ||||
| -rw-r--r-- | cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters | 7 |
3 files changed, 4 insertions, 49 deletions
diff --git a/cpp/src/IceUtil/ArgVector.h b/cpp/src/IceUtil/ArgVector.h deleted file mode 100644 index 0648112f7ad..00000000000 --- a/cpp/src/IceUtil/ArgVector.h +++ /dev/null @@ -1,41 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_UTIL_ARGVECTOR_H -#define ICE_UTIL_ARGVECTOR_H - -#include <IceUtil/Config.h> -#include <vector> -#include <string> - -namespace IceUtilInternal -{ - -class ICE_API ArgVector -{ -public: - - ArgVector(int argc, const char* const argv[]); - ArgVector(const ::std::vector< ::std::string>&); - ArgVector(const ArgVector&); - ArgVector& operator=(const ArgVector&); - ~ArgVector(); - - int argc; - char** argv; - -private: - - ::std::vector< ::std::string> _args; - void setupArgcArgv(); -}; - -} - -#endif 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> |