From 6d11d56fea0e6dd31331db85570a757182b50b71 Mon Sep 17 00:00:00 2001
From: Phil Nash <phil@twobluecubes.com>
Date: Tue, 15 Mar 2011 18:43:13 +0000
Subject: [PATCH] Correctness fixes (for VS)

---
 .../TestCatch/TestCatch/TestCatch.vcproj      | 136 ++++++++++++++++++
 internal/catch_capture.hpp                    |   2 +
 internal/catch_common.h                       |   1 +
 3 files changed, 139 insertions(+)

diff --git a/Test/VisualStudio/TestCatch/TestCatch/TestCatch.vcproj b/Test/VisualStudio/TestCatch/TestCatch/TestCatch.vcproj
index 139de602..e2a2e8fb 100644
--- a/Test/VisualStudio/TestCatch/TestCatch/TestCatch.vcproj
+++ b/Test/VisualStudio/TestCatch/TestCatch/TestCatch.vcproj
@@ -181,6 +181,30 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\..\..\catch.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\catch_reporter_basic.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\catch_reporter_junit.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\catch_reporter_xml.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\catch_runner.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\catch_with_main.hpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -220,6 +244,118 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Internal"
+			>
+			<File
+				RelativePath="..\..\..\..\internal\catch_capture.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_commandline.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_config.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_debugger.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_evaluate.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_generators.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_generators_impl.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_hub.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_hub_impl.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_interfaces_capture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_interfaces_reporter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_interfaces_runner.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_interfaces_testcase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_list.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_reporter_registrars.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_reporter_registry.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_result_type.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_resultinfo.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_runner_impl.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_section.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_self_test.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_stream.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_test_case_info.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_test_case_registry_impl.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_test_registry.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\internal\catch_xmlwriter.hpp"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\ReadMe.txt"
 			>
diff --git a/internal/catch_capture.hpp b/internal/catch_capture.hpp
index 72b449a0..09286568 100644
--- a/internal/catch_capture.hpp
+++ b/internal/catch_capture.hpp
@@ -261,6 +261,8 @@ private:
 template<typename T>
 class Expression
 {
+	void operator = ( const Expression& );
+
 public:
     ///////////////////////////////////////////////////////////////////////////
     Expression
diff --git a/internal/catch_common.h b/internal/catch_common.h
index 02307d2d..3d010a13 100644
--- a/internal/catch_common.h
+++ b/internal/catch_common.h
@@ -25,6 +25,7 @@
 
 #include <sstream>
 #include <stdexcept>
+#include <algorithm>
 
 namespace Catch
 {