From bbc8a8fdc4afe271906048cd73d236a7b00ae768 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Tue, 25 Mar 2014 12:18:36 -0700
Subject: [PATCH] Move hardened_hash to container/

---
 Builds/VisualStudio2013/ripple.sln                |  1 +
 src/beast/Builds/VisualStudio2013/beast.vcxproj   |  8 +++++++-
 .../Builds/VisualStudio2013/beast.vcxproj.filters | 15 +++++++++------
 src/beast/beast/container/Container.cpp           |  1 +
 .../beast/{utility => container}/hardened_hash.h  |  8 ++++----
 .../tests/hardened_hash.test.cpp                  |  0
 src/beast/beast/crypto/UnsignedInteger.h          |  2 +-
 src/beast/beast/utility/Utility.cpp               |  1 -
 src/ripple/types/api/IdentifierStorage.h          |  2 +-
 src/ripple/types/api/base_uint.h                  |  2 +-
 10 files changed, 25 insertions(+), 15 deletions(-)
 rename src/beast/beast/{utility => container}/hardened_hash.h (96%)
 rename src/beast/beast/{utility => container}/tests/hardened_hash.test.cpp (100%)

diff --git a/Builds/VisualStudio2013/ripple.sln b/Builds/VisualStudio2013/ripple.sln
index 12114c44cd..a9d70ae3f4 100644
--- a/Builds/VisualStudio2013/ripple.sln
+++ b/Builds/VisualStudio2013/ripple.sln
@@ -16,6 +16,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.ActiveCfg = Debug|Win32
+		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.Build.0 = Debug|Win32
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.ActiveCfg = Debug|x64
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.Build.0 = Debug|x64
 		{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj b/src/beast/Builds/VisualStudio2013/beast.vcxproj
index 47b7b51153..41e22745e2 100644
--- a/src/beast/Builds/VisualStudio2013/beast.vcxproj
+++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj
@@ -129,6 +129,7 @@
     <ClInclude Include="..\..\beast\container\detail\aged_container_iterator.h" />
     <ClInclude Include="..\..\beast\container\detail\aged_unordered_container.h" />
     <ClInclude Include="..\..\beast\container\buffer_view.h" />
+    <ClInclude Include="..\..\beast\container\hardened_hash.h" />
     <ClInclude Include="..\..\beast\Crypto.h" />
     <ClInclude Include="..\..\beast\crypto\BinaryEncoding.h" />
     <ClInclude Include="..\..\beast\crypto\impl\sha2\sha2.h" />
@@ -239,7 +240,6 @@
     <ClInclude Include="..\..\beast\utility\Debug.h" />
     <ClInclude Include="..\..\beast\utility\empty_base_optimization.h" />
     <ClInclude Include="..\..\beast\utility\Error.h" />
-    <ClInclude Include="..\..\beast\utility\hardened_hash.h" />
     <ClInclude Include="..\..\beast\utility\hash_pair.h" />
     <ClInclude Include="..\..\beast\utility\is_call_possible.h" />
     <ClInclude Include="..\..\beast\utility\Journal.h" />
@@ -442,6 +442,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\beast\container\tests\hardened_hash.test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\beast\crypto\Crypto.cpp" />
     <ClCompile Include="..\..\beast\crypto\impl\MurmurHash.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
diff --git a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
index fd8abd157b..cce6101fc1 100644
--- a/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
+++ b/src/beast/Builds/VisualStudio2013/beast.vcxproj.filters
@@ -65,7 +65,7 @@
       <Filter>beast\crypto\impl\sha2</Filter>
     </None>
     <None Include="..\..\scripts\compile.sh">
-      <Filter>scripts</Filter>
+      <Filter>beast_asio\scripts</Filter>
     </None>
     <None Include="..\..\beast\asio\README.md">
       <Filter>beast\asio</Filter>
@@ -204,9 +204,6 @@
     <Filter Include="beast\chrono\impl">
       <UniqueIdentifier>{39886e0f-1607-4b7a-81cf-011d83dadee3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="scripts">
-      <UniqueIdentifier>{c65af439-8c23-46c3-9b95-7da15651e5f6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="beast\config\compiler">
       <UniqueIdentifier>{8d88283b-24ec-49ca-a94b-cb6271bc14f9}</UniqueIdentifier>
     </Filter>
@@ -303,6 +300,9 @@
     <Filter Include="beast\unit_test\tests">
       <UniqueIdentifier>{8dc7ce09-9255-48c0-8a90-78a0f94d22c5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="beast_asio\scripts">
+      <UniqueIdentifier>{c65af439-8c23-46c3-9b95-7da15651e5f6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\modules\beast_core\beast_core.h">
@@ -1182,8 +1182,8 @@
     <ClInclude Include="..\..\beast\unit_test\define_print.cpp">
       <Filter>beast\unit_test</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\utility\hardened_hash.h">
-      <Filter>beast\utility</Filter>
+    <ClInclude Include="..\..\beast\container\hardened_hash.h">
+      <Filter>beast\container</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -1640,6 +1640,9 @@
     <ClCompile Include="..\..\beast\unit_test\tests\main.cpp">
       <Filter>beast\unit_test\tests</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\beast\container\tests\hardened_hash.test.cpp">
+      <Filter>beast\container\tests</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\TODO.txt">
diff --git a/src/beast/beast/container/Container.cpp b/src/beast/beast/container/Container.cpp
index c11ccfa882..d94f3087a8 100644
--- a/src/beast/beast/container/Container.cpp
+++ b/src/beast/beast/container/Container.cpp
@@ -23,3 +23,4 @@
 
 #include "tests/aged_associative_container.test.cpp"
 #include "tests/buffer_view.test.cpp"
+#include "tests/hardened_hash.test.cpp"
diff --git a/src/beast/beast/utility/hardened_hash.h b/src/beast/beast/container/hardened_hash.h
similarity index 96%
rename from src/beast/beast/utility/hardened_hash.h
rename to src/beast/beast/container/hardened_hash.h
index 6e1979609c..6c76a5a091 100644
--- a/src/beast/beast/utility/hardened_hash.h
+++ b/src/beast/beast/container/hardened_hash.h
@@ -17,12 +17,12 @@
 */
 //==============================================================================
 
-#ifndef BEAST_UTILITY_HARDENED_HASH_H_INCLUDED
-#define BEAST_UTILITY_HARDENED_HASH_H_INCLUDED
+#ifndef BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
+#define BEAST_CONTAINER_HARDENED_HASH_H_INCLUDED
 
-#include "is_call_possible.h"
+#include "../utility/is_call_possible.h"
 
-#include "noexcept.h"
+#include "../utility/noexcept.h"
 #include <functional>
 #include <mutex>
 #include <random>
diff --git a/src/beast/beast/utility/tests/hardened_hash.test.cpp b/src/beast/beast/container/tests/hardened_hash.test.cpp
similarity index 100%
rename from src/beast/beast/utility/tests/hardened_hash.test.cpp
rename to src/beast/beast/container/tests/hardened_hash.test.cpp
diff --git a/src/beast/beast/crypto/UnsignedInteger.h b/src/beast/beast/crypto/UnsignedInteger.h
index 4b2069c0ec..26847d8271 100644
--- a/src/beast/beast/crypto/UnsignedInteger.h
+++ b/src/beast/beast/crypto/UnsignedInteger.h
@@ -24,7 +24,7 @@
 #include "MurmurHash.h"
 
 #include "../ByteOrder.h"
-#include "../utility/hardened_hash.h"
+#include "../container/hardened_hash.h"
 
 #include "../utility/noexcept.h"
 #include <algorithm>
diff --git a/src/beast/beast/utility/Utility.cpp b/src/beast/beast/utility/Utility.cpp
index e9b8f16929..45fcdeefcf 100644
--- a/src/beast/beast/utility/Utility.cpp
+++ b/src/beast/beast/utility/Utility.cpp
@@ -31,4 +31,3 @@
 
 #include "tests/bassert.test.cpp"
 #include "tests/empty_base_optimization.test.cpp"
-#include "tests/hardened_hash.test.cpp"
diff --git a/src/ripple/types/api/IdentifierStorage.h b/src/ripple/types/api/IdentifierStorage.h
index ec892162e7..a98d3ea349 100644
--- a/src/ripple/types/api/IdentifierStorage.h
+++ b/src/ripple/types/api/IdentifierStorage.h
@@ -22,7 +22,7 @@
 
 #include "../../beast/beast/FixedArray.h"
 #include "../../beast/beast/crypto/MurmurHash.h"
-#include "../../beast/beast/utility/hardened_hash.h"
+#include "../../beast/beast/container/hardened_hash.h"
 
 namespace ripple {
 
diff --git a/src/ripple/types/api/base_uint.h b/src/ripple/types/api/base_uint.h
index 48f8cfe80b..87911e7693 100644
--- a/src/ripple/types/api/base_uint.h
+++ b/src/ripple/types/api/base_uint.h
@@ -25,7 +25,7 @@
 #ifndef RIPPLE_TYPES_BASE_UINT_H_INCLUDED
 #define RIPPLE_TYPES_BASE_UINT_H_INCLUDED
 
-#include "../../beast/beast/utility/hardened_hash.h"
+#include "../../beast/beast/container/hardened_hash.h"
 
 #include <functional>