Merge branch 'develop' into pf_api

2026-04-29 15:37:57 +00:00 · 2013-05-03 13:13:48 -07:00
parent 9e47107255 99223f9fff
commit e0c6ae2095
6 changed files with 59 additions and 4 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Visual Studio
+*.sln       text eol=crlf
+*.vcproj    text eol=crlf
+*.vcxproj   text eol=crlf
+*.props     text eol=crlf
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,7 @@ db/*.db-*
 rippled.cfg
 validators.txt
 test/config.js
+
+# These are generated by protoc
+ripple.pb.cc
+ripple.pb.h
--- a/RippleD.props
+++ b/RippleD.props
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <RepoDir>.</RepoDir>
+    <SrcDir>$(RepoDir)\src\cpp\ripple</SrcDir>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="RepoDir">
+      <Value>$(RepoDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SrcDir">
+      <Value>$(SrcDir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -34,18 +34,24 @@
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="RippleD.props" />
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="RippleD.props" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
    <TargetName>rippled</TargetName>
+    <OutDir>$(SolutionDir)build\VisualStudio2012\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>rippled</TargetName>
+    <OutDir>$(SolutionDir)build\VisualStudio2012\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\obj\VisualStudio2012\$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@@ -55,6 +61,8 @@
      <PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>.\;..\OpenSSL\include;..\boost_1_52_0;..\protobuf\src</AdditionalIncludeDirectories>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild>false</MinimalRebuild>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -79,6 +87,7 @@
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>.\;..\OpenSSL\include;..\boost_1_52_0;..\protobuf\src</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -106,6 +115,7 @@
    <ClCompile Include="src\cpp\ripple\BitcoinUtil.cpp" />
    <ClCompile Include="src\cpp\ripple\CallRPC.cpp" />
    <ClCompile Include="src\cpp\ripple\CanonicalTXSet.cpp" />
+    <ClCompile Include="src\cpp\ripple\ChangeTransactor.cpp" />
    <ClCompile Include="src\cpp\ripple\Config.cpp" />
    <ClCompile Include="src\cpp\ripple\ConnectionPool.cpp" />
    <ClCompile Include="src\cpp\ripple\Contract.cpp" />
@@ -220,6 +230,7 @@
    <ClInclude Include="src\cpp\ripple\BitcoinUtil.h" />
    <ClInclude Include="src\cpp\ripple\CallRPC.h" />
    <ClInclude Include="src\cpp\ripple\CanonicalTXSet.h" />
+    <ClInclude Include="src\cpp\ripple\ChangeTransactor.h" />
    <ClInclude Include="src\cpp\ripple\Config.h" />
    <ClInclude Include="src\cpp\ripple\ConnectionPool.h" />
    <ClInclude Include="src\cpp\ripple\Contract.h" />
@@ -328,10 +339,10 @@
    <None Include="SConstruct" />
    <CustomBuild Include="src\cpp\ripple\ripple.proto">
      <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"../protobuf/protoc" -I=..\newcoin --cpp_out=..\newcoin\  ..\newcoin/src/cpp/ripple/ripple.proto</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\code\newcoin\src\ripple.pb.h</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/code/protobuf/protoc -I=..\newcoin --cpp_out=\code\newcoin\  ..\newcoin/src/cpp/ripple/ripple.proto</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\code\newcoin\src\ripple.pb.h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">protoc --cpp_out=$(SrcDir) -I=$(SrcDir) "$(SrcDir)\%(Filename)%(Extension)"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs>
    </CustomBuild>
    <None Include="test\buster.js" />
    <None Include="test\server.js" />
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -375,6 +375,9 @@
    <ClCompile Include="src\cpp\ripple\AmountRound.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="src\cpp\ripple\ChangeTransactor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="util\pugiconfig.hpp">
@@ -716,6 +719,9 @@
    <ClInclude Include="src\cpp\websocketpp\src\sockets\tls.hpp">
      <Filter>Header Files\websocket</Filter>
    </ClInclude>
+    <ClInclude Include="src\cpp\ripple\ChangeTransactor.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="wallet.xml" />
--- a/src/cpp/websocketpp/src/messages/data.hpp
+++ b/src/cpp/websocketpp/src/messages/data.hpp
@@ -36,6 +36,10 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/function.hpp>
 #include <boost/intrusive_ptr.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 105300 // 1.53.00
+#include <boost/thread/lock_guard.hpp>
+#endif
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/utility.hpp>