Revert "Renamed google_benchmark submodule to benchmark"

2 files changed, 107 insertions, 107 deletions

diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
index 1f59806cd4..52774e0802 100644
--- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
+++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj
@@ -147,53 +147,53 @@
   </ItemDefinitionGroup>
 
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark_api.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\macros.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\reporter.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\arraysize.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_api_internal.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\check.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\cycleclock.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\internal_macros.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\log.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\mutex.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\re.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\stat.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.h" />
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\timers.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h" />
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_register.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\console_reporter.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\csv_reporter.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\json_reporter.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\reporter.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc">
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\timers.cc">
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
     </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters
index 6f8fb9d6e2..9db6ed4657 100644
--- a/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters
+++ b/vsprojects/vcxproj/google_benchmark/google_benchmark.vcxproj.filters
@@ -1,106 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_register.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_register.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\console_reporter.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\console_reporter.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\csv_reporter.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\csv_reporter.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\json_reporter.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\json_reporter.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\reporter.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\reporter.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\third_party\benchmark\src\timers.cc">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClCompile Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.cc">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark.h">
-      <Filter>third_party\benchmark\include\benchmark</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark.h">
+      <Filter>third_party\google_benchmark\include\benchmark</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\benchmark_api.h">
-      <Filter>third_party\benchmark\include\benchmark</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\benchmark_api.h">
+      <Filter>third_party\google_benchmark\include\benchmark</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\macros.h">
-      <Filter>third_party\benchmark\include\benchmark</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\macros.h">
+      <Filter>third_party\google_benchmark\include\benchmark</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\include\benchmark\reporter.h">
-      <Filter>third_party\benchmark\include\benchmark</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\include\benchmark\reporter.h">
+      <Filter>third_party\google_benchmark\include\benchmark</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\arraysize.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\arraysize.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\benchmark_api_internal.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\benchmark_api_internal.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\check.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\check.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\colorprint.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\colorprint.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\commandlineflags.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\commandlineflags.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\complexity.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\complexity.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\cycleclock.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\cycleclock.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\internal_macros.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\internal_macros.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\log.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\log.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\mutex.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\mutex.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\re.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\re.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sleep.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sleep.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\stat.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\stat.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\string_util.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\string_util.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\sysinfo.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\sysinfo.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\third_party\benchmark\src\timers.h">
-      <Filter>third_party\benchmark\src</Filter>
+    <ClInclude Include="$(SolutionDir)\..\third_party\google_benchmark\src\timers.h">
+      <Filter>third_party\google_benchmark\src</Filter>
     </ClInclude>
   </ItemGroup>
 
@@ -108,17 +108,17 @@
     <Filter Include="third_party">
       <UniqueIdentifier>{7458b63d-7ba4-103d-2bed-3e3ad30d8237}</UniqueIdentifier>
     </Filter>
-    <Filter Include="third_party\benchmark">
-      <UniqueIdentifier>{3111b1b0-21cd-89e5-1dde-68eee22f75d8}</UniqueIdentifier>
+    <Filter Include="third_party\google_benchmark">
+      <UniqueIdentifier>{54a154e8-669b-a7c1-9b6e-bd1aab2f86e3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="third_party\benchmark\include">
-      <UniqueIdentifier>{045f2c9f-39a8-d548-4596-2b82a180314a}</UniqueIdentifier>
+    <Filter Include="third_party\google_benchmark\include">
+      <UniqueIdentifier>{f54c3cb1-ec20-a651-6956-78379b51e1a5}</UniqueIdentifier>
     </Filter>
-    <Filter Include="third_party\benchmark\include\benchmark">
-      <UniqueIdentifier>{dcedff65-88c1-3daa-2a2e-25911e9c9752}</UniqueIdentifier>
+    <Filter Include="third_party\google_benchmark\include\benchmark">
+      <UniqueIdentifier>{0483a457-8050-4565-bc15-09695bf7b822}</UniqueIdentifier>
     </Filter>
-    <Filter Include="third_party\benchmark\src">
-      <UniqueIdentifier>{d3343091-ae27-29e9-3c59-09b21561282c}</UniqueIdentifier>
+    <Filter Include="third_party\google_benchmark\src">
+      <UniqueIdentifier>{c39ff2d1-691e-4614-4d75-4bc20db05e09}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>