ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2ad98a025eb263d97b1942fc468937b4719becd8' into develop

Browse Source 
Conflicts:
	src/beast/beast/utility/PropertyStream.h
	src/beast/beast/utility/impl/PropertyStream.cpp
	src/beast/modules/beast_sqlite/beast_sqlite.h
This commit is contained in:
Vinnie Falco
2013-10-19 15:57:15 -07:00
parent 67516766a6 2ad98a025e
commit 04f2d0787a
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/beast/beast/intrusive/List.h
View File

@@ -46,8 +46,7 @@ class ListNode
private: private:
typedef T value_type; typedef T value_type;
template <typename, typename> friend class List<T, Tag>;
friend class List;
template <typename> template <typename>
friend class ListIterator; friend class ListIterator;

4
src/beast/beast/net/BufferType.h
View File

@@ -53,7 +53,7 @@ public:
template <bool OtherIsConst> template <bool OtherIsConst>
BufferType (BufferType <OtherIsConst> const& other) BufferType (BufferType <OtherIsConst> const& other)
: m_data (other.cast <pointer_type> ()) : m_data (other.template cast <pointer_type> ())
, m_size (other.size ()) , m_size (other.size ())
{ {
} }
@@ -75,7 +75,7 @@ public:
BufferType& operator= ( BufferType& operator= (
BufferType <OtherIsConst> const& other) noexcept BufferType <OtherIsConst> const& other) noexcept
{ {
m_data = other.cast <pointer_type> (); m_data = other.template cast <pointer_type> ();
m_size = other.size (); m_size = other.size ();
return *this; return *this;
} }

4
src/beast/beast/smart_ptr/SharedPtr.h
View File

@@ -164,7 +164,7 @@ public:
template <class U> template <class U>
SharedPtr (SharedPtr <U>&& sp) noexcept SharedPtr (SharedPtr <U>&& sp) noexcept
: m_p (sp.swap <U> (nullptr)) : m_p (sp.template swap <U> (nullptr))
{ {
} }
/** @} */ /** @} */
@@ -185,7 +185,7 @@ public:
template <class U> template <class U>
SharedPtr& operator= (SharedPtr <U>&& sp) SharedPtr& operator= (SharedPtr <U>&& sp)
{ {
return assign (sp.swap <U> (nullptr)); return assign (sp.template swap <U> (nullptr));
} }
/** @} */ /** @} */
#endif #endif

4
src/beast/beast/utility/PropertyStream.h
View File

@@ -110,11 +110,11 @@ private:
class PropertyStream::Proxy class PropertyStream::Proxy
{ {
private: private:
Map* m_map; Map const* m_map;
std::string m_key; std::string m_key;
public: public:
Proxy (Map& map, std::string const& key); Proxy (Map const& map, std::string const& key);
template <typename Value> template <typename Value>
Proxy& operator= (Value value); Proxy& operator= (Value value);

2
src/beast/beast/utility/impl/PropertyStream.cpp
View File

@@ -56,7 +56,7 @@ PropertyStream::Source& PropertyStream::Item::operator* () const
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
PropertyStream::Proxy::Proxy ( PropertyStream::Proxy::Proxy (
Map& map, std::string const& key) Map const& map, std::string const& key)
: m_map (&map) : m_map (&map)
, m_key (key) , m_key (key)
{ {

2
src/beast/modules/beast_core/native/mac_Network.mm
View File

@@ -21,6 +21,8 @@
*/ */
//============================================================================== //==============================================================================
#include "../network/URL.h"
void MACAddress::findAllAddresses (Array<MACAddress>& result) void MACAddress::findAllAddresses (Array<MACAddress>& result)
{ {
ifaddrs* addrs = nullptr; ifaddrs* addrs = nullptr;

2
src/beast/modules/beast_sqlite/beast_sqlite.h
View File

@@ -30,7 +30,7 @@
see BeastConfig.h. see BeastConfig.h.
*/ */
#include "../../../beast/beast/config/PlatformConfig.h" #include "../../beast/config/PlatformConfig.h"
#if BEAST_IOS || BEAST_MAC #if BEAST_IOS || BEAST_MAC
# define BEAST_HAVE_NATIVE_SQLITE 1 # define BEAST_HAVE_NATIVE_SQLITE 1