From 6217966743fa173fb7e173b7de0d94c0bae83320 Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Fri, 11 May 2012 19:06:43 +0100
Subject: [PATCH] Regenerated single include

---
 single_include/catch.hpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index a4cf0fe..4bca13c 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -73,9 +73,9 @@ namespace Catch
     struct SourceLineInfo
     {
         SourceLineInfo() : line( 0 ){}
-        SourceLineInfo( const std::string& file, std::size_t line )
-        :   file( file ),
-            line( line )
+        SourceLineInfo( const std::string& _file, std::size_t _line )
+        :   file( _file ),
+            line( _line )
         {}
         SourceLineInfo( const SourceLineInfo& other )
         :   file( other.file ),
@@ -577,7 +577,7 @@ inline std::string toString( unsigned long value ) {
 }
 
 inline std::string toString( unsigned int value ) {
-    return toString( (unsigned long)value );
+    return toString( static_cast<unsigned long>( value ) );
 }
 
 inline std::string toString( const double value ) {
@@ -2798,6 +2798,7 @@ return @ desc; \
 #include <vector>
 #include <set>
 #include <sstream>
+#include <iostream>
 
 namespace Catch
 {
@@ -4856,12 +4857,12 @@ namespace Catch
                 m_config.stream() << resultInfo.getExpression();
                 if( resultInfo.ok() )
                 {
-                    TextColour colour( TextColour::Success );
+                    TextColour successColour( TextColour::Success );
                     m_config.stream() << " succeeded";
                 }
                 else
                 {
-                    TextColour colour( TextColour::Error );
+                    TextColour errorColour( TextColour::Error );
                     m_config.stream() << " failed";
                 }
             }