diff --git a/.gitignore b/.gitignore index 569f38d8..0e036fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ projects/XCode4/CatchSelfTest/DerivedData projects/XCode4/OCTest/DerivedData *.pyc projects/XCode4/iOSTest/DerivedData +*.opensdf +projects/VS2012/TestCatch/TestCatch.sdf diff --git a/include/internal/clara.h b/include/internal/clara.h index b2ffc586..9421fecd 100644 --- a/include/internal/clara.h +++ b/include/internal/clara.h @@ -22,6 +22,7 @@ #include "tbc_text_format.h" #undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE +#include #include #include #include diff --git a/include/reporters/catch_reporter_bases.hpp b/include/reporters/catch_reporter_bases.hpp index 21e70980..58aa04da 100644 --- a/include/reporters/catch_reporter_bases.hpp +++ b/include/reporters/catch_reporter_bases.hpp @@ -99,6 +99,7 @@ namespace Catch { return node->stats.sectionInfo.lineInfo == m_other.lineInfo; } private: + BySectionInfo& operator=( BySectionInfo const& other ); // = delete; SectionInfo const& m_other; }; diff --git a/projects/VS2012/TestCatch/TestCatch.sln b/projects/VS2012/TestCatch/TestCatch.sln new file mode 100644 index 00000000..efb4502b --- /dev/null +++ b/projects/VS2012/TestCatch/TestCatch.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCatch", "TestCatch\TestCatch.vcxproj", "{A2F23B19-9CF7-4246-AE58-BC65E39C6F7E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A2F23B19-9CF7-4246-AE58-BC65E39C6F7E}.Debug|Win32.ActiveCfg = Debug|Win32 + {A2F23B19-9CF7-4246-AE58-BC65E39C6F7E}.Debug|Win32.Build.0 = Debug|Win32 + {A2F23B19-9CF7-4246-AE58-BC65E39C6F7E}.Release|Win32.ActiveCfg = Release|Win32 + {A2F23B19-9CF7-4246-AE58-BC65E39C6F7E}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/projects/VS2012/TestCatch/TestCatch/TestCatch.vcxproj b/projects/VS2012/TestCatch/TestCatch/TestCatch.vcxproj new file mode 100644 index 00000000..04e23b10 --- /dev/null +++ b/projects/VS2012/TestCatch/TestCatch/TestCatch.vcxproj @@ -0,0 +1,154 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {A2F23B19-9CF7-4246-AE58-BC65E39C6F7E} + TestCatch + Win32Proj + + + + Application + Unicode + true + v110 + + + Application + Unicode + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + true + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + ProgramDatabase + true + + + true + Console + MachineX86 + + + + + MaxSpeed + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level4 + ProgramDatabase + ..\..\..\..\include;%(AdditionalIncludeDirectories) + true + 4702 + + + true + Console + true + true + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file