ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-28 06:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add BEAST_FILEANDLINE_ macro for warning pragmas

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-21 09:33:48 -07:00
parent cdc28c3fcf
commit 68ceab0f63
7 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@@ -101,7 +101,6 @@ INCLUDE_PATHS = [
]
COMPILED_FILES = [
'src/cpp/database/sqlite3.c',
'src/cpp/leveldb_core.cpp',
'Subtrees/beast/modules/beast_core/beast_core.cpp',
'Subtrees/beast/modules/beast_basics/beast_basics.cpp',
@@ -109,6 +108,7 @@ COMPILED_FILES = [
'modules/ripple_data/ripple_data.cpp',
'modules/ripple_json/ripple_json.cpp',
'modules/ripple_websocket/ripple_websocket.cpp',
'modules/ripple_sqlite/ripple_sqlite.c',
'modules/ripple_app/ripple_app_pt1.cpp',
'modules/ripple_app/ripple_app_pt2.cpp',
'modules/ripple_app/ripple_app_pt3.cpp',

14
Subtrees/beast/modules/beast_basics/beast_basics.h
View File

@@ -248,14 +248,6 @@
#define BEAST_USE_BZIP2 0
#endif
#ifndef BEAST_USE_FREETYPE
#define BEAST_USE_FREETYPE 0
#endif
#ifndef BEAST_USE_NATIVE_FREETYPE
#define BEAST_USE_NATIVE_FREETYPE 1
#endif
#ifndef BEAST_USE_NATIVE_SQLITE
#define BEAST_USE_NATIVE_SQLITE 1
#endif
@@ -267,12 +259,6 @@
/* Get this early so we can use it. */
#include "../beast_core/system/beast_TargetPlatform.h"
// Handy macro that lets pragma warnings be clicked in the output window
// Usage: #pragma message(BEAST_LOC_"Advertise here!")
#define BEAST_STR2_(x) #x
#define BEAST_STR1_(x) BEAST_STR2_(x)
#define BEAST_LOC_ __FILE__ "("BEAST_STR1_(__LINE__)") : WARNING: "
#if BEAST_USE_BOOST
#include <boost/thread/tss.hpp>
#endif

2
Subtrees/beast/modules/beast_basics/diagnostic/beast_CatchAny.cpp
View File

@@ -181,7 +181,7 @@ LPTOP_LEVEL_EXCEPTION_FILTER ScopedPlatformExceptionCatcher::s_sehPrev = 0;
// TODO: POSIX SIGNAL HANDLER
#pragma message(BEAST_LOC_"Missing class ScopedPlatformExceptionCatcher")
#pragma message(BEAST_FILEANDLINE_ "Missing class ScopedPlatformExceptionCatcher")
namespace vf
{

2
Subtrees/beast/modules/beast_basics/native/beast_posix_FPUFlags.cpp
View File

@@ -17,7 +17,7 @@
*/
//==============================================================================
//#pragma message(BEAST_LOC_"Missing platform-specific implementation")
//#pragma message(BEAST_FILEANDLINE_ "Missing platform-specific implementation")
FPUFlags FPUFlags::getCurrent ()
{

14
Subtrees/beast/modules/beast_core/system/beast_TargetPlatform.h
View File

@@ -193,4 +193,18 @@
#error unknown compiler
#endif
//------------------------------------------------------------------------------
// Handy macro that lets pragma warnings be clicked in the output window
//
// Usage: #pragma message(BEAST_FILEANDLINE_ "Advertise here!")
//
// Note that a space following the macro is mandatory for C++11.
//
// This is here so it can be used in C compilations that include this directly.
//
#define BEAST_PP_STR2_(x) #x
#define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x)
#define BEAST_FILEANDLINE_ __FILE__ "(" BEAST_PP_STR1_(__LINE__) "): warning:"
#endif // BEAST_TARGETPLATFORM_BEASTHEADER

5
modules/ripple_sqlite/ripple_sqlite.c
View File

@@ -48,11 +48,6 @@
*/
//#define SQLITE_THREADSAFE 2
// VFALCO TODO Move this into Beast
#define BEAST_PP_STR2_(x) #x
#define BEAST_PP_STR1_(x) BEAST_PP_STR2_(x)
#define BEAST_FILEANDLINE_ __FILE__ "("BEAST_PP_STR1_(__LINE__)"): warning:"
// VFALCO TODO We should try running with SQLITE_THREADSAFE==2 and see what happens.
#if SQLITE_THREADSAFE != 2
#pragma message(BEAST_FILEANDLINE_"Possible performance issue, SQLITE_THREADSAFE != 2")

1
modules/ripple_sqlite/ripple_sqlite.h
View File

@@ -20,6 +20,7 @@
#ifndef RIPPLE_SQLITE_RIPPLEHEADER
#define RIPPLE_SQLITE_RIPPLEHEADER
// Include this directly because we compile under both C and C++
#include "beast/modules/beast_core/system/beast_TargetPlatform.h"
#if ! RIPPLE_SQLITE_MODULE_INCLUDED