Put json in its own module with header

This commit is contained in:
Vinnie Falco
2013-05-25 12:36:56 -07:00
parent e227637e34
commit ce66f950cf
53 changed files with 197 additions and 244 deletions

View File

@@ -39,10 +39,10 @@
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include "../ripple_json/ripple_json.h"
#include "types/ripple_IntegerTypes.h" #include "types/ripple_IntegerTypes.h"
#include "containers/ripple_KeyCache.h" #include "containers/ripple_KeyCache.h"
#include "events/ripple_UptimeTimer.h" #include "events/ripple_UptimeTimer.h"
#endif #endif

View File

@@ -1,6 +1,9 @@
#ifndef JSON_AUTOLINK_H_INCLUDED #ifndef JSON_AUTOLINK_H_INCLUDED
# define JSON_AUTOLINK_H_INCLUDED # define JSON_AUTOLINK_H_INCLUDED
// VFALCO: TODO, remove this file
#error This file is deprecated!
# include "config.h" # include "config.h"
# ifdef JSON_IN_CPPTL # ifdef JSON_IN_CPPTL

View File

@@ -1,7 +1,7 @@
#ifndef CPPTL_JSON_FEATURES_H_INCLUDED #ifndef CPPTL_JSON_FEATURES_H_INCLUDED
# define CPPTL_JSON_FEATURES_H_INCLUDED #define CPPTL_JSON_FEATURES_H_INCLUDED
# include "forwards.h" #include "json_forwards.h"
namespace Json { namespace Json {

View File

@@ -1,7 +1,7 @@
#ifndef JSON_FORWARDS_H_INCLUDED #ifndef JSON_FORWARDS_H_INCLUDED
# define JSON_FORWARDS_H_INCLUDED # define JSON_FORWARDS_H_INCLUDED
# include "config.h" # include "json_config.h"
namespace Json { namespace Json {

View File

@@ -1,5 +1,7 @@
#include "reader.h"
#include "value.h" #include "json_reader.h"
#include "json_value.h"
#include <utility> #include <utility>
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>

View File

@@ -1,12 +1,13 @@
#ifndef CPPTL_JSON_READER_H_INCLUDED #ifndef CPPTL_JSON_READER_H_INCLUDED
# define CPPTL_JSON_READER_H_INCLUDED # define CPPTL_JSON_READER_H_INCLUDED
# include "features.h" #include "json_features.h"
# include "value.h" #include "json_value.h"
# include <deque>
# include <stack> #include <deque>
# include <string> #include <stack>
# include <iostream> #include <string>
#include <iostream>
namespace Json { namespace Json {

View File

@@ -1,6 +1,6 @@
#include <iostream> #include <iostream>
#include "value.h" #include "json_value.h"
#include "writer.h" #include "json_writer.h"
#include <utility> #include <utility>
#include <stdexcept> #include <stdexcept>
#include <cstring> #include <cstring>

View File

@@ -1,18 +1,19 @@
#ifndef CPPTL_JSON_H_INCLUDED #ifndef CPPTL_JSON_H_INCLUDED
# define CPPTL_JSON_H_INCLUDED # define CPPTL_JSON_H_INCLUDED
# include "forwards.h" #include "json_forwards.h"
# include <string>
# include <vector>
# ifndef JSON_USE_CPPTL_SMALLMAP #include <string>
# include <map> #include <vector>
# else
# include <cpptl/smallmap.h> #ifndef JSON_USE_CPPTL_SMALLMAP
# endif # include <map>
# ifdef JSON_USE_CPPTL #else
# include <cpptl/forwards.h> # include <cpptl/smallmap.h>
# endif #endif
#ifdef JSON_USE_CPPTL
# include <cpptl/forwards.h>
#endif
/** \brief JSON (JavaScript Object Notation). /** \brief JSON (JavaScript Object Notation).
*/ */

View File

@@ -1,4 +1,3 @@
#include "writer.h"
#include <utility> #include <utility>
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
@@ -7,6 +6,8 @@
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>
#include "json_writer.h"
#if _MSC_VER >= 1400 // VC++ 8.0 #if _MSC_VER >= 1400 // VC++ 8.0
#pragma warning( disable : 4996 ) // disable warning about strdup being deprecated. #pragma warning( disable : 4996 ) // disable warning about strdup being deprecated.
#endif #endif

View File

@@ -1,7 +1,8 @@
#ifndef JSON_WRITER_H_INCLUDED #ifndef JSON_WRITER_H_INCLUDED
# define JSON_WRITER_H_INCLUDED # define JSON_WRITER_H_INCLUDED
# include "value.h" # include "json_value.h"
# include <vector> # include <vector>
# include <string> # include <string>
# include <iostream> # include <iostream>

View File

@@ -0,0 +1,29 @@
//------------------------------------------------------------------------------
/*
Copyright (c) 2011-2013, OpenCoin, Inc.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
/** Add this to get the @ref ripple_json module.
@file ripple_json.cpp
@ingroup ripple_json
*/
#include "ripple_json.h"
#include "json/json_reader.cpp"
#include "json/json_value.cpp"
#include "json/json_writer.cpp"

View File

@@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
/*
Copyright (c) 2011-2013, OpenCoin, Inc.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
//==============================================================================
/** Include this to get the @ref ripple_json module.
@file ripple_json.h
@ingroup ripple_json
*/
/** JSON parsiing and output support.
A simple set of JSON manipulation classes.
@defgroup ripple_json
*/
#ifndef RIPPLE_JSON_H
#define RIPPLE_JSON_H
#include "json/json_reader.h"
#include "json/json_writer.h"
#include "json/json_value.h"
#endif

View File

@@ -64,8 +64,6 @@
#include "src/cpp/database/SqliteDatabase.h" #include "src/cpp/database/SqliteDatabase.h"
#include "src/cpp/json/writer.h"
// VFALCO: TODO, resolve the location of this file // VFALCO: TODO, resolve the location of this file
//#include "src/cpp/ripple/ripple.pb.h" //#include "src/cpp/ripple/ripple.pb.h"
#include "ripple.pb.h" #include "ripple.pb.h"

View File

@@ -182,6 +182,25 @@
<ClCompile Include="modules\ripple_basics\ripple_basics.cpp" /> <ClCompile Include="modules\ripple_basics\ripple_basics.cpp" />
<ClCompile Include="modules\ripple_client\ripple_client.cpp" /> <ClCompile Include="modules\ripple_client\ripple_client.cpp" />
<ClCompile Include="modules\ripple_db\ripple_db.cpp" /> <ClCompile Include="modules\ripple_db\ripple_db.cpp" />
<ClCompile Include="modules\ripple_json\json\json_reader.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="modules\ripple_json\json\json_value.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="modules\ripple_json\json\json_writer.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="modules\ripple_json\ripple_json.cpp" />
<ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" /> <ClCompile Include="modules\ripple_ledger\ripple_ledger.cpp" />
<ClCompile Include="modules\ripple_main\ripple_main.cpp" /> <ClCompile Include="modules\ripple_main\ripple_main.cpp" />
<ClCompile Include="modules\ripple_mess\ripple_mess.cpp" /> <ClCompile Include="modules\ripple_mess\ripple_mess.cpp" />
@@ -199,25 +218,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\json\json_reader.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="src\cpp\json\json_value.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="src\cpp\json\json_writer.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="src\cpp\json_core.cpp" />
<ClCompile Include="src\cpp\leveldb\db\builder.cc"> <ClCompile Include="src\cpp\leveldb\db\builder.cc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1175,66 +1175,22 @@
<ClInclude Include="modules\ripple_basics\types\ripple_IntegerTypes.h" /> <ClInclude Include="modules\ripple_basics\types\ripple_IntegerTypes.h" />
<ClInclude Include="modules\ripple_client\ripple_client.h" /> <ClInclude Include="modules\ripple_client\ripple_client.h" />
<ClInclude Include="modules\ripple_db\ripple_db.h" /> <ClInclude Include="modules\ripple_db\ripple_db.h" />
<ClInclude Include="modules\ripple_json\json\json.h" />
<ClInclude Include="modules\ripple_json\json\json_autolink.h" />
<ClInclude Include="modules\ripple_json\json\json_batchallocator.h" />
<ClInclude Include="modules\ripple_json\json\json_config.h" />
<ClInclude Include="modules\ripple_json\json\json_features.h" />
<ClInclude Include="modules\ripple_json\json\json_forwards.h" />
<ClInclude Include="modules\ripple_json\json\json_reader.h" />
<ClInclude Include="modules\ripple_json\json\json_value.h" />
<ClInclude Include="modules\ripple_json\json\json_writer.h" />
<ClInclude Include="modules\ripple_json\ripple_json.h" />
<ClInclude Include="modules\ripple_ledger\ripple_ledger.h" /> <ClInclude Include="modules\ripple_ledger\ripple_ledger.h" />
<ClInclude Include="modules\ripple_main\ripple_main.h" /> <ClInclude Include="modules\ripple_main\ripple_main.h" />
<ClInclude Include="modules\ripple_mess\ripple_mess.h" /> <ClInclude Include="modules\ripple_mess\ripple_mess.h" />
<ClInclude Include="modules\ripple_net\ripple_net.h" /> <ClInclude Include="modules\ripple_net\ripple_net.h" />
<ClInclude Include="src\cpp\database\database.h" /> <ClInclude Include="src\cpp\database\database.h" />
<ClInclude Include="src\cpp\database\SqliteDatabase.h" /> <ClInclude Include="src\cpp\database\SqliteDatabase.h" />
<ClInclude Include="src\cpp\json\autolink.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\config.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\features.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\forwards.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\json.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\json_batchallocator.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\reader.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\value.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\json\writer.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="src\cpp\leveldb\db\builder.h"> <ClInclude Include="src\cpp\leveldb\db\builder.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1658,6 +1614,9 @@
<ClInclude Include="src\cpp\websocketpp\src\websocket_frame.hpp" /> <ClInclude Include="src\cpp\websocketpp\src\websocket_frame.hpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="modules\ripple_json\json\json_internalarray.inl" />
<None Include="modules\ripple_json\json\json_internalmap.inl" />
<None Include="modules\ripple_json\json\json_valueiterator.inl" />
<None Include="SConstruct" /> <None Include="SConstruct" />
<CustomBuild Include="src\cpp\ripple\ripple.proto"> <CustomBuild Include="src\cpp\ripple\ripple.proto">
<FileType>Document</FileType> <FileType>Document</FileType>
@@ -1670,24 +1629,6 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(RepoDir)\build\proto\%(Filename).pb.h;$(RepoDir)\build\proto\%(Filename).pb.cc</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SrcDir)\%(Filename).pb.h;$(SrcDir)\%(Filename).pb.cc</Outputs>
</CustomBuild> </CustomBuild>
<None Include="src\cpp\json\json_internalarray.inl">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</None>
<None Include="src\cpp\json\json_internalmap.inl">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</None>
<None Include="src\cpp\json\json_valueiterator.inl">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</None>
<None Include="src\cpp\protobuf\src\google\protobuf\descriptor.proto"> <None Include="src\cpp\protobuf\src\google\protobuf\descriptor.proto">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

View File

@@ -7,12 +7,6 @@
<Filter Include="0. Third Party Code\SQLite"> <Filter Include="0. Third Party Code\SQLite">
<UniqueIdentifier>{60c3631e-8855-4a61-bdd3-9892d96242d5}</UniqueIdentifier> <UniqueIdentifier>{60c3631e-8855-4a61-bdd3-9892d96242d5}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="0. Third Party Code\json">
<UniqueIdentifier>{c642219d-cace-47c1-828a-58ba570da63a}</UniqueIdentifier>
</Filter>
<Filter Include="0. Third Party Code\json\core">
<UniqueIdentifier>{ca69d54b-9228-4767-9cef-81e489621683}</UniqueIdentifier>
</Filter>
<Filter Include="0. Third Party Code\websocket"> <Filter Include="0. Third Party Code\websocket">
<UniqueIdentifier>{cd4c41c0-3ee6-49f8-8322-d11422b892f9}</UniqueIdentifier> <UniqueIdentifier>{cd4c41c0-3ee6-49f8-8322-d11422b892f9}</UniqueIdentifier>
</Filter> </Filter>
@@ -127,6 +121,15 @@
<Filter Include="1. Modules\ripple_basics\events"> <Filter Include="1. Modules\ripple_basics\events">
<UniqueIdentifier>{f585ac4d-1867-4f3d-b0a2-eceae4d7e7e7}</UniqueIdentifier> <UniqueIdentifier>{f585ac4d-1867-4f3d-b0a2-eceae4d7e7e7}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="1. Modules\ripple_json">
<UniqueIdentifier>{9f33883e-d53d-469f-ab51-653ac3e8780b}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_json\json">
<UniqueIdentifier>{670d727d-6c99-4893-b0bb-e620975e8b8d}</UniqueIdentifier>
</Filter>
<Filter Include="1. Modules\ripple_json\json\DEPRECATED">
<UniqueIdentifier>{e398b116-a7fa-4850-8b8e-6de95efdea4e}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\cpp\database\sqlite3.c"> <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -159,18 +162,6 @@
<ClCompile Include="src\cpp\websocketpp\src\uri.cpp"> <ClCompile Include="src\cpp\websocketpp\src\uri.cpp">
<Filter>0. Third Party Code\websocket\core</Filter> <Filter>0. Third Party Code\websocket\core</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\json_core.cpp">
<Filter>0. Third Party Code\json</Filter>
</ClCompile>
<ClCompile Include="src\cpp\json\json_reader.cpp">
<Filter>0. Third Party Code\json\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\json\json_value.cpp">
<Filter>0. Third Party Code\json\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\json\json_writer.cpp">
<Filter>0. Third Party Code\json\core</Filter>
</ClCompile>
<ClCompile Include="src\cpp\leveldb_core.cpp"> <ClCompile Include="src\cpp\leveldb_core.cpp">
<Filter>0. Third Party Code\LevelDB</Filter> <Filter>0. Third Party Code\LevelDB</Filter>
</ClCompile> </ClCompile>
@@ -744,6 +735,18 @@
<ClCompile Include="modules\ripple_basics\events\ripple_UptimeTimer.cpp"> <ClCompile Include="modules\ripple_basics\events\ripple_UptimeTimer.cpp">
<Filter>1. Modules\ripple_basics\events</Filter> <Filter>1. Modules\ripple_basics\events</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="modules\ripple_json\json\json_reader.cpp">
<Filter>1. Modules\ripple_json\json</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_json\json\json_value.cpp">
<Filter>1. Modules\ripple_json\json</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_json\json\json_writer.cpp">
<Filter>1. Modules\ripple_json\json</Filter>
</ClCompile>
<ClCompile Include="modules\ripple_json\ripple_json.cpp">
<Filter>1. Modules\ripple_json</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="database\sqlite3ext.h"> <ClInclude Include="database\sqlite3ext.h">
@@ -785,33 +788,6 @@
<ClInclude Include="src\cpp\websocketpp\src\websocketpp.hpp"> <ClInclude Include="src\cpp\websocketpp\src\websocketpp.hpp">
<Filter>0. Third Party Code\websocket\core</Filter> <Filter>0. Third Party Code\websocket\core</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\json\autolink.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\config.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\features.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\forwards.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\json.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\json_batchallocator.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\reader.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\value.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\json\writer.h">
<Filter>0. Third Party Code\json\core</Filter>
</ClInclude>
<ClInclude Include="src\cpp\leveldb\db\builder.h"> <ClInclude Include="src\cpp\leveldb\db\builder.h">
<Filter>0. Third Party Code\LevelDB\db</Filter> <Filter>0. Third Party Code\LevelDB\db</Filter>
</ClInclude> </ClInclude>
@@ -1388,22 +1364,52 @@
<ClInclude Include="modules\ripple_basics\types\ripple_IntegerTypes.h"> <ClInclude Include="modules\ripple_basics\types\ripple_IntegerTypes.h">
<Filter>1. Modules\ripple_basics\types</Filter> <Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="modules\ripple_json\json\json_batchallocator.h">
<Filter>1. Modules\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json_config.h">
<Filter>1. Modules\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json_forwards.h">
<Filter>1. Modules\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json_reader.h">
<Filter>1. Modules\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json_value.h">
<Filter>1. Modules\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json_writer.h">
<Filter>1. Modules\ripple_json\json</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json.h">
<Filter>1. Modules\ripple_json\json\DEPRECATED</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json_autolink.h">
<Filter>1. Modules\ripple_json\json\DEPRECATED</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\ripple_json.h">
<Filter>1. Modules\ripple_json</Filter>
</ClInclude>
<ClInclude Include="modules\ripple_json\json\json_features.h">
<Filter>1. Modules\ripple_json\json</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="SConstruct" /> <None Include="SConstruct" />
<None Include="validators.txt" /> <None Include="validators.txt" />
<None Include="src\cpp\json\json_internalarray.inl">
<Filter>0. Third Party Code\json\core</Filter>
</None>
<None Include="src\cpp\json\json_internalmap.inl">
<Filter>0. Third Party Code\json\core</Filter>
</None>
<None Include="src\cpp\json\json_valueiterator.inl">
<Filter>0. Third Party Code\json\core</Filter>
</None>
<None Include="src\cpp\protobuf\src\google\protobuf\descriptor.proto"> <None Include="src\cpp\protobuf\src\google\protobuf\descriptor.proto">
<Filter>0. Third Party Code\protobuf\protobuf</Filter> <Filter>0. Third Party Code\protobuf\protobuf</Filter>
</None> </None>
<None Include="modules\ripple_json\json\json_internalarray.inl">
<Filter>1. Modules\ripple_json\json</Filter>
</None>
<None Include="modules\ripple_json\json\json_internalmap.inl">
<Filter>1. Modules\ripple_json\json</Filter>
</None>
<None Include="modules\ripple_json\json\json_valueiterator.inl">
<Filter>1. Modules\ripple_json\json</Filter>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="src\cpp\ripple\ripple.proto" /> <CustomBuild Include="src\cpp\ripple\ripple.proto" />

View File

@@ -1,7 +0,0 @@
// JSON parser unity build
//
#include "json/json_reader.cpp"
#include "json/json_value.cpp"
#include "json/json_writer.cpp"

View File

@@ -9,8 +9,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "../json/value.h"
#include "RippleAddress.h" #include "RippleAddress.h"
#include "SerializedLedger.h" #include "SerializedLedger.h"

View File

@@ -20,9 +20,6 @@
#include <openssl/buffer.h> #include <openssl/buffer.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include "../json/value.h"
#include "../json/reader.h"
#include "Application.h" #include "Application.h"
#include "RPC.h" #include "RPC.h"
#include "Log.h" #include "Log.h"

View File

@@ -3,8 +3,6 @@
#include <string> #include <string>
#include "../json/value.h"
class RPCParser class RPCParser
{ {
protected: protected:

View File

@@ -10,8 +10,6 @@
#include "ParseSection.h" #include "ParseSection.h"
#include "SerializedTypes.h" #include "SerializedTypes.h"
#include "../json/value.h"
#define ENABLE_INSECURE 0 // 1, to enable unnecessary features. #define ENABLE_INSECURE 0 // 1, to enable unnecessary features.
#define SYSTEM_NAME "ripple" #define SYSTEM_NAME "ripple"

View File

@@ -5,8 +5,6 @@
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include "../json/value.h"
#include "Ledger.h" #include "Ledger.h"
class FeatureSet class FeatureSet

View File

@@ -11,8 +11,6 @@
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#include "../json/value.h"
#include "LoadMonitor.h" #include "LoadMonitor.h"
// Note that this queue should only be used for CPU-bound jobs // Note that this queue should only be used for CPU-bound jobs

View File

@@ -8,8 +8,6 @@
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include "../json/value.h"
#include "Transaction.h" #include "Transaction.h"
#include "TransactionMeta.h" #include "TransactionMeta.h"
#include "AccountState.h" #include "AccountState.h"

View File

@@ -8,8 +8,6 @@
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include "../json/value.h"
#include "key.h" #include "key.h"
#include "Transaction.h" #include "Transaction.h"
#include "LedgerAcquire.h" #include "LedgerAcquire.h"

View File

@@ -6,8 +6,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "../json/value.h"
#include "RippleAddress.h" #include "RippleAddress.h"
#include "Serializer.h" #include "Serializer.h"
#include "InstanceCounter.h" #include "InstanceCounter.h"

View File

@@ -5,8 +5,6 @@
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include "../json/value.h"
extern int upTime(); extern int upTime();

View File

@@ -18,9 +18,6 @@ namespace boost {
*/ */
#include <boost/filesystem.hpp> // unfortunately needed to compile #include <boost/filesystem.hpp> // unfortunately needed to compile
// Ensure that we don't get value.h without writer.h
#include "../json/json.h"
enum LogSeverity enum LogSeverity
{ {
lsINVALID = -1, // used to indicate an invalid severity lsINVALID = -1, // used to indicate an invalid severity

View File

@@ -9,8 +9,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp> #include <boost/weak_ptr.hpp>
#include "../json/value.h"
#include "uint256.h" #include "uint256.h"
#include "RippleAddress.h" #include "RippleAddress.h"
#include "SerializedTypes.h" #include "SerializedTypes.h"

View File

@@ -7,8 +7,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include "../json/value.h"
class Parameter : public boost::enable_shared_from_this<Parameter> class Parameter : public boost::enable_shared_from_this<Parameter>
{ // abstract base class parameters are derived from { // abstract base class parameters are derived from
public: public:

View File

@@ -5,8 +5,6 @@
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#include "../json/writer.h"
#include "Version.h" #include "Version.h"
#include "Peer.h" #include "Peer.h"
#include "Config.h" #include "Config.h"

View File

@@ -4,8 +4,6 @@
#include <string> #include <string>
#include <map> #include <map>
#include "../json/value.h"
enum http_status_type enum http_status_type
{ {
ok = 200, ok = 200,

View File

@@ -4,8 +4,6 @@
#include "RPCErr.h" #include "RPCErr.h"
#include "utils.h" #include "utils.h"
#include "../json/writer.h"
// For logging // For logging
struct RPCErr { }; struct RPCErr { };

View File

@@ -1,8 +1,6 @@
#ifndef __RPCERR__ #ifndef __RPCERR__
#define __RPCERR__ #define __RPCERR__
#include "../json/value.h"
enum { enum {
rpcSUCCESS = 0, rpcSUCCESS = 0,
rpcBAD_SYNTAX, // Must be 1 to print usage to command line. rpcBAD_SYNTAX, // Must be 1 to print usage to command line.

View File

@@ -3,8 +3,6 @@
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
#include "../json/value.h"
#include "RippleAddress.h" #include "RippleAddress.h"
#include "SerializedTypes.h" #include "SerializedTypes.h"
#include "Ledger.h" #include "Ledger.h"

View File

@@ -14,9 +14,6 @@
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/asio/read_until.hpp> #include <boost/asio/read_until.hpp>
#include "../json/reader.h"
#include "../json/writer.h"
#ifndef RPC_MAXIMUM_QUERY #ifndef RPC_MAXIMUM_QUERY
#define RPC_MAXIMUM_QUERY (1024*1024) #define RPC_MAXIMUM_QUERY (1024*1024)
#endif #endif

View File

@@ -6,8 +6,6 @@
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include "../json/value.h"
#include "HTTPRequest.h" #include "HTTPRequest.h"
#include "RippleAddress.h" #include "RippleAddress.h"
#include "NetworkOPs.h" #include "NetworkOPs.h"

View File

@@ -3,8 +3,6 @@
#include <deque> #include <deque>
#include "../json/value.h"
#include "NetworkOPs.h" #include "NetworkOPs.h"
#define RPC_EVENT_QUEUE_MAX 32 #define RPC_EVENT_QUEUE_MAX 32

View File

@@ -5,8 +5,6 @@
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include "../json/value.h"
#include "SerializedTypes.h" #include "SerializedTypes.h"
#include "InstanceCounter.h" #include "InstanceCounter.h"

View File

@@ -4,8 +4,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "../json/value.h"
#include "uint256.h" #include "uint256.h"
#include "Serializer.h" #include "Serializer.h"
#include "FieldNames.h" #include "FieldNames.h"

View File

@@ -11,8 +11,6 @@
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <boost/cstdint.hpp> #include <boost/cstdint.hpp>
#include "../json/value.h"
#include "key.h" #include "key.h"
#include "uint256.h" #include "uint256.h"
#include "ripple.pb.h" #include "ripple.pb.h"

View File

@@ -6,8 +6,6 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include "../json/value.h"
#include "uint256.h" #include "uint256.h"
#include "Serializer.h" #include "Serializer.h"
#include "SerializedTypes.h" #include "SerializedTypes.h"

View File

@@ -8,8 +8,6 @@
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
#include "../json/value.h"
#include "RippleAddress.h" #include "RippleAddress.h"
#include "Config.h" #include "Config.h"
#include "HttpsClient.h" #include "HttpsClient.h"

View File

@@ -2,8 +2,6 @@
#include "../websocketpp/src/sockets/autotls.hpp" #include "../websocketpp/src/sockets/autotls.hpp"
#include "../websocketpp/src/websocketpp.hpp" #include "../websocketpp/src/websocketpp.hpp"
#include "../json/value.h"
#include <boost/weak_ptr.hpp> #include <boost/weak_ptr.hpp>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>

View File

@@ -12,8 +12,6 @@
#include "openssl/ec.h" #include "openssl/ec.h"
#include "openssl/dh.h" #include "openssl/dh.h"
#include "../json/value.h"
#include "uint256.h" #include "uint256.h"
#include "Serializer.h" #include "Serializer.h"

View File

@@ -8,9 +8,6 @@
#include <openssl/buffer.h> #include <openssl/buffer.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include "../json/value.h"
#include "../json/writer.h"
#include "RPC.h" #include "RPC.h"
#include "BitcoinUtil.h" #include "BitcoinUtil.h"
#include "Config.h" #include "Config.h"