Move hardened_hash to container/

This commit is contained in:
Vinnie Falco
2014-03-25 12:18:36 -07:00
parent 428872731a
commit bbc8a8fdc4
10 changed files with 25 additions and 15 deletions

View File

@@ -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

View File

@@ -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>

View File

@@ -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">

View File

@@ -23,3 +23,4 @@
#include "tests/aged_associative_container.test.cpp"
#include "tests/buffer_view.test.cpp"
#include "tests/hardened_hash.test.cpp"

View File

@@ -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>

View File

@@ -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>

View File

@@ -31,4 +31,3 @@
#include "tests/bassert.test.cpp"
#include "tests/empty_base_optimization.test.cpp"
#include "tests/hardened_hash.test.cpp"

View File

@@ -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 {

View File

@@ -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>