ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-05 08:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hoist integer types to ripple namespace

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-27 15:30:49 -07:00
parent 1a2c87b3a8
commit 72702185e2
5 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Builds/VisualStudio2012/RippleD.vcxproj
View File

@@ -1605,7 +1605,6 @@
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_DiffieHellmanUtil.h" /> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_DiffieHellmanUtil.h" />
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_HashUtilities.h" /> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_HashUtilities.h" />
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_IniFile.h" /> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_IniFile.h" />
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_IntegerTypes.h" />
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Log.h" /> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Log.h" />
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_PlatformMacros.h" /> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_PlatformMacros.h" />
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_RandomNumbers.h" /> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_RandomNumbers.h" />

3
Builds/VisualStudio2012/RippleD.vcxproj.filters
View File

@@ -1202,9 +1202,6 @@
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_UptimeTimer.h"> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_UptimeTimer.h">
<Filter>1. Modules\ripple_basics\utility</Filter> <Filter>1. Modules\ripple_basics\utility</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_IntegerTypes.h">
<Filter>1. Modules\ripple_basics\utility</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Sustain.h"> <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Sustain.h">
<Filter>1. Modules\ripple_basics\utility</Filter> <Filter>1. Modules\ripple_basics\utility</Filter>
</ClInclude> </ClInclude>

8
modules/ripple_basics/ripple_basics.h
View File

@@ -49,7 +49,13 @@
namespace ripple namespace ripple
{ {
#include "utility/ripple_IntegerTypes.h" // must come first using beast::int16;
using beast::int32;
using beast::int64;
using beast::uint16;
using beast::uint32;
using beast::uint64;
#include "utility/ripple_Log.h" // Needed by others #include "utility/ripple_Log.h" // Needed by others
#include "types/ripple_BasicTypes.h" #include "types/ripple_BasicTypes.h"

4
modules/ripple_basics/types/ripple_BasicTypes.h
View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_TYPES_H #ifndef RIPPLE_BASICTYPES_H
#define RIPPLE_TYPES_H #define RIPPLE_BASICTYPES_H
/** Storage for linear binary data. /** Storage for linear binary data.

36
modules/ripple_basics/utility/ripple_IntegerTypes.h
View File

@@ -1,36 +0,0 @@
//------------------------------------------------------------------------------
/*
Copyright (c) 2011-2013, OpenCoin, Inc.
*/
//==============================================================================
#ifndef RIPPLE_INTEGERTYPES_H
#define RIPPLE_INTEGERTYPES_H
// VFALCO TODO Get rid of these and use the types from beast instead.
// VFALCO TODO determine if Borland C is supported
#if defined (_MSC_VER) /*|| defined(__BORLANDC__)*/
typedef __int64 int64;
typedef unsigned __int64 uint64;
typedef unsigned int uint32;
typedef unsigned short int uint16;
typedef int int32;
#else
typedef long long int64;
typedef unsigned long long uint64;
typedef unsigned int uint32;
typedef unsigned short int uint16;
typedef int int32;
#endif
// VFALCO TODO make sure minimum VS version is 9, 10, or 11
// If commenting this out creates a problem, contact me!
/*
#if defined(_MSC_VER) && _MSC_VER < 1300
#define for if (false) ; else for
#endif
*/
#endif