C++ Builder compatibility patch by Josh Kelley.

4 files changed, 38 insertions, 25 deletions

diff --git a/codegear/gtest.groupproj b/codegear/gtest.groupproj
index 8b650f8..faf31ca 100644
--- a/codegear/gtest.groupproj
+++ b/codegear/gtest.groupproj
@@ -23,15 +23,6 @@
   <Target Name="gtest:Make">

     <MSBuild Projects="gtest.cbproj" Targets="Make" />

   </Target>

-  <Target Name="gtest_unittest">

-    <MSBuild Projects="gtest_unittest.cbproj" Targets="" />

-  </Target>

-  <Target Name="gtest_unittest:Clean">

-    <MSBuild Projects="gtest_unittest.cbproj" Targets="Clean" />

-  </Target>

-  <Target Name="gtest_unittest:Make">

-    <MSBuild Projects="gtest_unittest.cbproj" Targets="Make" />

-  </Target>

   <Target Name="gtest_main">

     <MSBuild Projects="gtest_main.cbproj" Targets="" />

   </Target>

@@ -41,14 +32,23 @@
   <Target Name="gtest_main:Make">

     <MSBuild Projects="gtest_main.cbproj" Targets="Make" />

   </Target>

+  <Target Name="gtest_unittest">

+    <MSBuild Projects="gtest_unittest.cbproj" Targets="" />

+  </Target>

+  <Target Name="gtest_unittest:Clean">

+    <MSBuild Projects="gtest_unittest.cbproj" Targets="Clean" />

+  </Target>

+  <Target Name="gtest_unittest:Make">

+    <MSBuild Projects="gtest_unittest.cbproj" Targets="Make" />

+  </Target>

   <Target Name="Build">

-    <CallTarget Targets="gtest;gtest_unittest;gtest_main" />

+    <CallTarget Targets="gtest;gtest_main;gtest_unittest" />

   </Target>

   <Target Name="Clean">

-    <CallTarget Targets="gtest:Clean;gtest_unittest:Clean;gtest_main:Clean" />

+    <CallTarget Targets="gtest:Clean;gtest_main:Clean;gtest_unittest:Clean" />

   </Target>

   <Target Name="Make">

-    <CallTarget Targets="gtest:Make;gtest_unittest:Make;gtest_main:Make" />

+    <CallTarget Targets="gtest:Make;gtest_main:Make;gtest_unittest:Make" />

   </Target>

   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />

 </Project>
\ No newline at end of file
diff --git a/codegear/gtest_unittest.cbproj b/codegear/gtest_unittest.cbproj
index d3823c9..dc5db8e 100644
--- a/codegear/gtest_unittest.cbproj
+++ b/codegear/gtest_unittest.cbproj
@@ -18,27 +18,27 @@
     <CfgParent>Base</CfgParent>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Base)'!=''">

-    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>

     <OutputExt>exe</OutputExt>

-    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>

+    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>

     <Defines>NO_STRICT</Defines>

+    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>

     <DynamicRTL>true</DynamicRTL>

-    <UsePackages>true</UsePackages>

     <ILINK_ObjectSearchPath>..\test</ILINK_ObjectSearchPath>

-    <NoVCL>true</NoVCL>

+    <UsePackages>true</UsePackages>

     <ProjectType>CppConsoleApplication</ProjectType>

+    <NoVCL>true</NoVCL>

     <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>

-    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi</PackageImports>

+    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi</PackageImports>

     <BCC_wpar>false</BCC_wpar>

     <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</IncludePath>

     <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</ILINK_LibraryPath>

     <Multithreaded>true</Multithreaded>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Cfg_1)'!=''">

-    <DCC_Optimize>false</DCC_Optimize>

     <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>

-    <Defines>_DEBUG;$(Defines)</Defines>

+    <DCC_Optimize>false</DCC_Optimize>

     <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>

+    <Defines>_DEBUG;$(Defines)</Defines>

     <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>

     <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>

     <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>

@@ -48,8 +48,8 @@
     <IntermediateOutputDir>Debug</IntermediateOutputDir>

     <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>

     <BCC_StackFrames>true</BCC_StackFrames>

-    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>

     <BCC_DisableOptimizations>true</BCC_DisableOptimizations>

+    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>

     <TASM_Debugging>Full</TASM_Debugging>

     <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>

   </PropertyGroup>

diff --git a/include/gtest/internal/gtest-string.h b/include/gtest/internal/gtest-string.h
index d1d0297..aff093d 100644
--- a/include/gtest/internal/gtest-string.h
+++ b/include/gtest/internal/gtest-string.h
@@ -41,6 +41,11 @@
 #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
 #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
 
+#ifdef __BORLANDC__
+// string.h is not guaranteed to provide strcpy on C++ Builder.
+#include <mem.h>
+#endif
+
 #include <string.h>
 #include <gtest/internal/gtest-port.h>
 
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc
index 199b254..717bd4e 100644
--- a/test/gtest_unittest.cc
+++ b/test/gtest_unittest.cc
@@ -323,7 +323,7 @@ TEST(NullLiteralTest, IsFalseForNonNullLiterals) {
 }
 
 #ifdef __BORLANDC__
-// Restores warnings after previous "#pragma option push" supressed them
+// Restores warnings after previous "#pragma option push" suppressed them.
 #pragma option pop
 #endif
 
@@ -1353,7 +1353,7 @@ void DoesNotAbortHelper(bool* aborted) {
 }
 
 #ifdef __BORLANDC__
-// Restores warnings after previous "#pragma option push" supressed them
+// Restores warnings after previous "#pragma option push" suppressed them.
 #pragma option pop
 #endif
 
@@ -1371,7 +1371,7 @@ static int global_var = 0;
 #define GTEST_USE_UNPROTECTED_COMMA_ global_var++, global_var++
 
 TEST_F(ExpectFatalFailureTest, AcceptsMacroThatExpandsToUnprotectedComma) {
-#ifndef __BORLANDC__
+#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x600
   // ICE's in C++Builder 2007.
   EXPECT_FATAL_FAILURE({
     GTEST_USE_UNPROTECTED_COMMA_;
@@ -3490,10 +3490,13 @@ TEST(AssertionTest, ASSERT_TRUE) {
 // Tests ASSERT_TRUE(predicate) for predicates returning AssertionResult.
 TEST(AssertionTest, AssertTrueWithAssertionResult) {
   ASSERT_TRUE(ResultIsEven(2));
+#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x600
+  // ICE's in C++Builder 2007.
   EXPECT_FATAL_FAILURE(ASSERT_TRUE(ResultIsEven(3)),
                        "Value of: ResultIsEven(3)\n"
                        "  Actual: false (3 is odd)\n"
                        "Expected: true");
+#endif
   ASSERT_TRUE(ResultIsEvenNoExplanation(2));
   EXPECT_FATAL_FAILURE(ASSERT_TRUE(ResultIsEvenNoExplanation(3)),
                        "Value of: ResultIsEvenNoExplanation(3)\n"
@@ -3513,10 +3516,13 @@ TEST(AssertionTest, ASSERT_FALSE) {
 // Tests ASSERT_FALSE(predicate) for predicates returning AssertionResult.
 TEST(AssertionTest, AssertFalseWithAssertionResult) {
   ASSERT_FALSE(ResultIsEven(3));
+#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x600
+  // ICE's in C++Builder 2007.
   EXPECT_FATAL_FAILURE(ASSERT_FALSE(ResultIsEven(2)),
                        "Value of: ResultIsEven(2)\n"
                        "  Actual: true (2 is even)\n"
                        "Expected: false");
+#endif
   ASSERT_FALSE(ResultIsEvenNoExplanation(3));
   EXPECT_FATAL_FAILURE(ASSERT_FALSE(ResultIsEvenNoExplanation(2)),
                        "Value of: ResultIsEvenNoExplanation(2)\n"
@@ -3628,13 +3634,15 @@ void ThrowNothing() {}
 // Tests ASSERT_THROW.
 TEST(AssertionTest, ASSERT_THROW) {
   ASSERT_THROW(ThrowAnInteger(), int);
-#if !defined(__BORLANDC__) || __BORLANDC__ >= 0x600 || defined(_DEBUG)
-  // ICE's in C++Builder 2007 (Release build).
+
+#ifndef __BORLANDC__
+  // ICE's in C++Builder 2007 and 2009.
   EXPECT_FATAL_FAILURE(
       ASSERT_THROW(ThrowAnInteger(), bool),
       "Expected: ThrowAnInteger() throws an exception of type bool.\n"
       "  Actual: it throws a different type.");
 #endif
+
   EXPECT_FATAL_FAILURE(
       ASSERT_THROW(ThrowNothing(), bool),
       "Expected: ThrowNothing() throws an exception of type bool.\n"