Merge ripple_json to ripple_basics

This commit is contained in:
Vinnie Falco
2013-09-01 09:34:42 -07:00
parent 825ac4aca1
commit e256716da8
25 changed files with 162 additions and 184 deletions

View File

@@ -14,9 +14,11 @@
#include "ripple_basics.h"
// VFALCO TODO Rewrite Sustain to use beast::Process
//------------------------------------------------------------------------------
// For Sustain Linux variants
//
// These are for Sustain Linux variants
// VFALCO TODO Rewrite Sustain to use beast::Process
#ifdef __linux__
#include <sys/types.h>
#include <sys/prctl.h>
@@ -27,28 +29,56 @@
#include <sys/wait.h>
#endif
//------------------------------------------------------------------------------
// For json/
//
#ifdef JSON_USE_CPPTL
# include <cpptl/conststring.h>
#endif
#ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
#include "json/json_batchallocator.h"
#endif
#define JSON_ASSERT_UNREACHABLE assert( false )
#define JSON_ASSERT( condition ) assert( condition ); // @todo <= change this into an exception throw
#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message );
//------------------------------------------------------------------------------
// For random numbers
//
// VFALCO TODO Replace OpenSSL randomness with a dependency-free implementation
// Perhaps Schneier's Fortuna or a variant. Abstract the collection of
// entropy and provide OS-specific implementation. We can re-use the
// BearShare source code for this.
//
// Add Random number generation to the new VFLib
// Add Random number generation to beast
//
#include <openssl/rand.h> // Because of ripple_RandomNumbers.cpp
#ifdef BEAST_WIN32
#include <windows.h> // for ripple_RandomNumbers.cpp
#include <wincrypt.h> // for ripple_RandomNumbers.cpp
// Winsock #defines 'max' and does other stupid things so put it last
#include <Winsock2.h> // for ripple_ByteOrder.cpp
# include <windows.h> // for ripple_RandomNumbers.cpp
# include <wincrypt.h> // for ripple_RandomNumbers.cpp
# include <Winsock2.h> // for ripple_ByteOrder.cpp
// <Winsock2.h> defines 'max' and does other stupid things
# ifdef max
# undef max
# endif
#endif
//------------------------------------------------------------------------------
namespace ripple
{
#include "containers/ripple_RangeSet.cpp"
#include "containers/ripple_TaggedCache.cpp"
#include "json/json_reader.cpp"
#include "json/json_value.cpp"
#include "json/json_writer.cpp"
#include "utility/ripple_Log.cpp"
#include "utility/ripple_LogFile.cpp"