mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
General refactoring of beast framework classes
This commit is contained in:
@@ -17,8 +17,8 @@
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
#ifndef BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED
|
||||
#define BEAST_CORE_SYSTEM_BEASTCONFIGCHECK_H_INCLUDED
|
||||
#ifndef BEAST_CORE_BEASTCONFIGCHECK_H_INCLUDED
|
||||
#define BEAST_CORE_BEASTCONFIGCHECK_H_INCLUDED
|
||||
|
||||
// This file makes sure that BeastConfig.h was included.
|
||||
// It also sets defaults for all config options.
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
#ifndef BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
|
||||
#define BEAST_CORE_SYSTEM_BEFOREBOOST_H_INCLUDED
|
||||
|
||||
// TargetPlatform.h should not use anything from BeastConfig.h
|
||||
#include "TargetPlatform.h"
|
||||
#include "BeastConfigCheck.h"
|
||||
|
||||
// This file should be included before including any boost headers.
|
||||
// If you don't include this file, and you include boost headers,
|
||||
// Beast will generate a compile error with an explanation of why.
|
||||
|
||||
#include "TargetPlatform.h"
|
||||
|
||||
#include "BeastConfigCheck.h"
|
||||
|
||||
#if BEAST_USE_BOOST_FEATURES
|
||||
|
||||
// Prevent <boost/bind/placeholders.hpp> from being included
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
#ifndef BEAST_CORE_SYSTEM_BOOSTINCLUDES_H_INCLUDED
|
||||
#define BEAST_CORE_SYSTEM_BOOSTINCLUDES_H_INCLUDED
|
||||
#ifndef BEAST_CORE_BOOSTINCLUDES_H_INCLUDED
|
||||
#define BEAST_CORE_BOOSTINCLUDES_H_INCLUDED
|
||||
|
||||
#if BEAST_USE_BOOST_FEATURES
|
||||
|
||||
|
||||
@@ -21,16 +21,14 @@
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
#ifndef BEAST_PLATFORMDEFS_H_INCLUDED
|
||||
#define BEAST_PLATFORMDEFS_H_INCLUDED
|
||||
#ifndef BEAST_CORE_PLATFORMDEFS_H_INCLUDED
|
||||
#define BEAST_CORE_PLATFORMDEFS_H_INCLUDED
|
||||
|
||||
// This file defines miscellaneous macros for debugging, assertions, etc.
|
||||
|
||||
#ifdef BEAST_FORCE_DEBUG
|
||||
#if BEAST_FORCE_DEBUG
|
||||
# undef BEAST_DEBUG
|
||||
# if BEAST_FORCE_DEBUG
|
||||
# define BEAST_DEBUG 1
|
||||
# endif
|
||||
# define BEAST_DEBUG 1
|
||||
#endif
|
||||
|
||||
/** This macro defines the C calling convention used as the standard for Beast calls.
|
||||
|
||||
@@ -47,7 +47,9 @@
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#include "PlatformDefs.h"
|
||||
#ifndef BEAST_CORE_PLATFORMDEFS_H_INCLUDED
|
||||
#error "PlatformDefs.h must be included first"
|
||||
#endif
|
||||
|
||||
// Now we'll include some common OS headers..
|
||||
#if BEAST_MSVC
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
#ifndef BEAST_TARGETPLATFORM_H_INCLUDED
|
||||
#define BEAST_TARGETPLATFORM_H_INCLUDED
|
||||
#ifndef BEAST_CORE_TARGETPLATFORM_H_INCLUDED
|
||||
#define BEAST_CORE_TARGETPLATFORM_H_INCLUDED
|
||||
|
||||
//==============================================================================
|
||||
/* This file figures out which platform is being built, and defines some macros
|
||||
@@ -213,4 +213,5 @@
|
||||
#define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x)
|
||||
#define BEAST_FILEANDLINE_ __FILE__ "(" BEAST_PP_STR1_(__LINE__) "): warning:"
|
||||
|
||||
#endif // BEAST_TARGETPLATFORM_H_INCLUDED
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user