From 8782df3ab52e4d1cf0484a488f54ed35475ef208 Mon Sep 17 00:00:00 2001
From: Beman <bdawes@acm.org>
Date: Mon, 18 Mar 2013 15:53:49 -0400
Subject: [PATCH] Get VC++ solution working with new directory structure
 (Except benchmark link errors).

---
 test/endian_test.cpp                    | 4 +++-
 test/msvc10/benchmark/benchmark.vcxproj | 5 ++---
 test/msvc10/common.props                | 2 +-
 test/scoped_enum_emulation_test.cpp     | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/endian_test.cpp b/test/endian_test.cpp
index 65461cf..008b123 100644
--- a/test/endian_test.cpp
+++ b/test/endian_test.cpp
@@ -74,7 +74,9 @@ namespace
     ++v; // verify integer_cover_operators being applied to this type -
          // will fail to compile if no endian<> specialization is present
 
-    v+v;
+    auto x = v+v;
+    if ( x == x ) // silence warning
+      return;
   }
 
   const char * big_rep    = "\x12\x34\x56\x78\x9A\xBC\xDE\xF0";
diff --git a/test/msvc10/benchmark/benchmark.vcxproj b/test/msvc10/benchmark/benchmark.vcxproj
index 74c5d6b..d42547a 100644
--- a/test/msvc10/benchmark/benchmark.vcxproj
+++ b/test/msvc10/benchmark/benchmark.vcxproj
@@ -87,9 +87,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\system\src\error_code.cpp" />
-    <ClCompile Include="..\..\..\support\run_timer.cpp" />
-    <ClCompile Include="..\..\..\support\run_timer_ctors.cpp" />
-    <ClCompile Include="..\..\..\support\timer.cpp" />
+    <ClCompile Include="..\..\..\..\timer\src\auto_timers_construction.cpp" />
+    <ClCompile Include="..\..\..\..\timer\src\cpu_timer.cpp" />
     <ClCompile Include="..\..\benchmark.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/test/msvc10/common.props b/test/msvc10/common.props
index 040249a..f80c979 100644
--- a/test/msvc10/common.props
+++ b/test/msvc10/common.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\endian\include;..\..\..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningLevel>EnableAllWarnings</WarningLevel>
     </ClCompile>
     <PostBuildEvent>
diff --git a/test/scoped_enum_emulation_test.cpp b/test/scoped_enum_emulation_test.cpp
index 419302d..16a0353 100644
--- a/test/scoped_enum_emulation_test.cpp
+++ b/test/scoped_enum_emulation_test.cpp
@@ -7,7 +7,7 @@
 
 //  See documentation at http://www.boost.org/libs/utility/scoped_enum_emulation.html
 
-#include <boost/endian/detail/disable_warnings.hpp>
+#include <boost/detail/disable_warnings.hpp>
 
 #include <boost/detail/scoped_enum_emulation.hpp>
 #include <boost/assert.hpp>