ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-25 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings and errors

Browse Source
This commit is contained in:
Vinnie Falco
2013-07-06 21:00:43 -07:00
parent b426d62075
commit d723f6194e
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Subtrees/beast/modules/beast_core/beast_core.cpp
View File

@@ -276,6 +276,22 @@ namespace beast
} }
#ifdef _CRTDBG_MAP_ALLOC
#pragma pop_macro("calloc")
#pragma pop_macro("free")
#pragma pop_macro("malloc")
#pragma pop_macro("realloc")
#pragma pop_macro("_recalloc")
#pragma pop_macro("_aligned_free")
#pragma pop_macro("_aligned_malloc")
#pragma pop_macro("_aligned_offset_malloc")
#pragma pop_macro("_aligned_realloc")
#pragma pop_macro("_aligned_recalloc")
#pragma pop_macro("_aligned_offset_realloc")
#pragma pop_macro("_aligned_offset_recalloc")
#pragma pop_macro("_aligned_msize")
#endif
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if BEAST_BOOST_IS_AVAILABLE #if BEAST_BOOST_IS_AVAILABLE

13
modules/ripple_data/protocol/ripple_KnownFormats.h
View File

@@ -59,6 +59,11 @@ public:
KeyType const m_type; KeyType const m_type;
}; };
private:
// VFALCO TODO use String instead of std::string
typedef std::map <std::string, Item*> NameMap;
typedef std::map <KeyType, Item*> TypeMap;
public: public:
/** Create the known formats object. /** Create the known formats object.
@@ -104,7 +109,7 @@ public:
{ {
Item* result = nullptr; Item* result = nullptr;
TypeMap::const_iterator const iter = m_types.find (type); typename TypeMap::const_iterator const iter = m_types.find (type);
if (iter != m_types.end ()) if (iter != m_types.end ())
{ {
@@ -121,7 +126,7 @@ protected:
{ {
Item* result = nullptr; Item* result = nullptr;
NameMap::const_iterator const iter = m_names.find (name); typename NameMap::const_iterator const iter = m_names.find (name);
if (iter != m_names.end ()) if (iter != m_names.end ())
{ {
@@ -159,10 +164,6 @@ protected:
virtual void addCommonFields (Item& item) = 0; virtual void addCommonFields (Item& item) = 0;
private: private:
// VFALCO TODO use String instead of std::string
typedef std::map <std::string, Item*> NameMap;
typedef std::map <KeyType, Item*> TypeMap;
OwnedArray <Item> m_formats; OwnedArray <Item> m_formats;
NameMap m_names; NameMap m_names;
TypeMap m_types; TypeMap m_types;

8
modules/ripple_data/protocol/ripple_LedgerFormats.h
View File

@@ -4,13 +4,15 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_LEDGERFORMAT_H #ifndef RIPPLE_LEDGERFORMATS_H_INCLUDED
#define RIPPLE_LEDGERFORMAT_H #define RIPPLE_LEDGERFORMATS_H_INCLUDED
/** /** Ledger entry types.
These are stored in serialized data. These are stored in serialized data.
@note Changing these values results in a hard fork.
@ingroup protocol @ingroup protocol
*/ */
// Used as the type of a transaction or the type of a ledger entry. // Used as the type of a transaction or the type of a ledger entry.