diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-08 05:57:37 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-09-08 05:57:37 +0000 |
| commit | b15c73341d7a7abff7a04e1de18de59ba0f34009 (patch) | |
| tree | 1e5c53fe552b388109a2e55bfd00ebdf671b9d30 /msvc | |
| parent | 5d0c3dc09ece41c649deea59f975d0ff5548424a (diff) | |
| download | gtest-b15c73341d7a7abff7a04e1de18de59ba0f34009.tar.gz gtest-b15c73341d7a7abff7a04e1de18de59ba0f34009.tar.bz2 gtest-b15c73341d7a7abff7a04e1de18de59ba0f34009.tar.xz | |
Removes all uses of StrStream; fixes the VC projects and simplifies them by using gtest-all.cc.
git-svn-id: http://googletest.googlecode.com/svn/trunk@481 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/gtest-md.vcproj | 113 | ||||
| -rw-r--r-- | msvc/gtest.vcproj | 113 | ||||
| -rw-r--r-- | msvc/gtest_main-md.vcproj | 36 | ||||
| -rw-r--r-- | msvc/gtest_main.vcproj | 36 |
4 files changed, 2 insertions, 296 deletions
diff --git a/msvc/gtest-md.vcproj b/msvc/gtest-md.vcproj index c78a4a4..1c35c3a 100644 --- a/msvc/gtest-md.vcproj +++ b/msvc/gtest-md.vcproj @@ -100,82 +100,7 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\src\gtest-death-test.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-filepath.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-port.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-test-part.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-typed-test.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest.cc">
+ RelativePath="..\src\gtest-all.cc">
<FileConfiguration
Name="Debug|Win32">
<Tool
@@ -194,42 +119,6 @@ Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath="..\include\gtest\internal\gtest-death-test-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-death-test.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-filepath.h">
- </File>
- <File
- RelativePath="..\src\gtest-internal-inl.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-message.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-port.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-spi.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-string.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_pred_impl.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_prod.h">
- </File>
</Filter>
</Files>
<Globals>
diff --git a/msvc/gtest.vcproj b/msvc/gtest.vcproj index bd2ed81..a8373ce 100644 --- a/msvc/gtest.vcproj +++ b/msvc/gtest.vcproj @@ -100,82 +100,7 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\src\gtest-death-test.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-filepath.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-test-part.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-port.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest-typed-test.cc">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""..";"..\include""/>
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\src\gtest.cc">
+ RelativePath="..\src\gtest-all.cc">
<FileConfiguration
Name="Debug|Win32">
<Tool
@@ -194,42 +119,6 @@ Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath="..\include\gtest\internal\gtest-death-test-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-death-test.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-filepath.h">
- </File>
- <File
- RelativePath="..\src\gtest-internal-inl.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-message.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-port.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-spi.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-string.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_pred_impl.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_prod.h">
- </File>
</Filter>
</Files>
<Globals>
diff --git a/msvc/gtest_main-md.vcproj b/msvc/gtest_main-md.vcproj index 321667f..b5379fe 100644 --- a/msvc/gtest_main-md.vcproj +++ b/msvc/gtest_main-md.vcproj @@ -122,42 +122,6 @@ Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath="..\include\gtest\internal\gtest-death-test-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-death-test.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-filepath.h">
- </File>
- <File
- RelativePath="..\src\gtest-internal-inl.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-message.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-port.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-spi.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-string.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_pred_impl.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_prod.h">
- </File>
</Filter>
</Files>
<Globals>
diff --git a/msvc/gtest_main.vcproj b/msvc/gtest_main.vcproj index 13cc1d4..e8b763c 100644 --- a/msvc/gtest_main.vcproj +++ b/msvc/gtest_main.vcproj @@ -122,42 +122,6 @@ Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath="..\include\gtest\internal\gtest-death-test-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-death-test.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-filepath.h">
- </File>
- <File
- RelativePath="..\src\gtest-internal-inl.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-internal.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-message.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-port.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest-spi.h">
- </File>
- <File
- RelativePath="..\include\gtest\internal\gtest-string.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_pred_impl.h">
- </File>
- <File
- RelativePath="..\include\gtest\gtest_prod.h">
- </File>
</Filter>
</Files>
<Globals>
|