Merge branch 'release-next' into release

Conflicts:
	src/ripple/module/app/paths/cursor/ForwardLiquidity.cpp
	src/ripple/overlay/tests/peer_info.test.cpp
	src/ripple/unity/http.h

Author: vinniefalco

.gitignore

@@ -19,6 +19,7 @@
 *.o
 build
 tags
+TAGS
 bin/rippled
 Debug/*.*
 Release/*.*

Builds/VisualStudio2013/RippleD.vcxproj

@@ -1,5 +1,5 @@
 Name:           rippled
-Version:        0.26.1
+Version:        0.26.2-alpha-4
 Release:        1%{?dist}
 Summary:        Ripple peer-to-peer network daemon
 

Builds/VisualStudio2013/RippleD.vcxproj.filters

@@ -247,15 +247,18 @@ def config_env(toolchain, variant, env):
             env.ParseConfig('pkg-config --static --cflags --libs openssl')
             env.ParseConfig('pkg-config --static --cflags --libs protobuf')
 
-        env.Prepend(CCFLAGS=['-Wall'])
+        env.Prepend(CFLAGS=['-Wall'])
+        env.Prepend(CXXFLAGS=['-Wall'])
 
         env.Append(CCFLAGS=[
             '-Wno-sign-compare',
             '-Wno-char-subscripts',
             '-Wno-format',
-            '-Wno-deprecated-register'
             ])
 
+        if toolchain == 'clang':
+            env.Append(CCFLAGS=['-Wno-redeclared-class-member'])
+
         env.Append(CXXFLAGS=[
             '-frtti',
             '-std=c++11',
@@ -329,16 +332,23 @@ def config_env(toolchain, variant, env):
             if Beast.system.osx:
                 env.Replace(CC='clang', CXX='clang++', LINK='clang++')
             elif 'CLANG_CC' in env and 'CLANG_CXX' in env and 'CLANG_LINK' in env:
-                env.Replace(CC=env['CLANG_CC'], CXX=env['CLANG_CXX'], LINK=env['CLANG_LINK'])
+                env.Replace(CC=env['CLANG_CC'],
+                            CXX=env['CLANG_CXX'],
+                            LINK=env['CLANG_LINK'])
             # C and C++
             # Add '-Wshorten-64-to-32'
             env.Append(CCFLAGS=[])
             # C++ only
-            env.Append(CXXFLAGS=['-Wno-mismatched-tags'])
+            env.Append(CXXFLAGS=[
+                '-Wno-mismatched-tags',
+                '-Wno-deprecated-register',
+                ])
 
         elif toolchain == 'gcc':
             if 'GNU_CC' in env and 'GNU_CXX' in env and 'GNU_LINK' in env:
-                env.Replace(CC=env['GNU_CC'], CXX=env['GNU_CXX'], LINK=env['GNU_LINK'])
+                env.Replace(CC=env['GNU_CC'],
+                            CXX=env['GNU_CXX'],
+                            LINK=env['GNU_LINK'])
             # Why is this only for gcc?!
             env.Append(CCFLAGS=['-Wno-unused-local-typedefs'])
 
@@ -542,7 +552,7 @@ for toolchain in all_toolchains:
 
         objects.append(addSource('src/ripple/unity/nodestore.cpp', env, variant_dirs, [
             'src/leveldb/include',
-            #'src/hyperleveldb/include', # hyper 
+            #'src/hyperleveldb/include', # hyper
             'src/rocksdb/include',
             ]))
 

Builds/rpm/rippled.spec

@@ -220,11 +220,23 @@
 #define RIPPLE_SINGLE_IO_SERVICE_THREAD 0
 #endif
 
-/** Config: RIPPLE_STRUCTURED_OVERLAY
-    Enables Structured Overlay support (unfinished)
+/** Config: RIPPLE_STRUCTURED_OVERLAY_CLIENT
+            RIPPLE_STRUCTURED_OVERLAY_SERVER
+    Enables Structured Overlay support for the client or server roles.
+    This feature is currently in development:
+        https://ripplelabs.atlassian.net/browse/RIPD-157
 */
-#ifndef RIPPLE_STRUCTURED_OVERLAY
-#define RIPPLE_STRUCTURED_OVERLAY 0
+#ifndef RIPPLE_STRUCTURED_OVERLAY_CLIENT
+#define RIPPLE_STRUCTURED_OVERLAY_CLIENT 0
+#endif
+#ifndef RIPPLE_STRUCTURED_OVERLAY_SERVER
+#define RIPPLE_STRUCTURED_OVERLAY_SERVER 1
+#endif
+
+/** Config: RIPPLE_ASYNC_RPC_HANDLER
+*/
+#ifndef RIPPLE_ASYNC_RPC_HANDLER
+#define RIPPLE_ASYNC_RPC_HANDLER 1
 #endif
 
 /** Config: RIPPLE_ASYNC_RPC_HANDLER

SConstruct

@@ -1,9 +1,9 @@
 # src
 
-Some of these directories come from entire outside repositories
-brought in using git-subtree. This means that the source files are
-inserted directly into the rippled repository. They can be edited
-and committed just as if they were normal files.
+Some of these directories come from entire outside repositories brought in
+using git-subtree. This means that the source files are inserted directly
+into the rippled repository. They can be edited and committed just as if they
+were normal files.
 
 However, if you create a commit that contains files both from a
 subtree, and from the ripple source tree please use care when designing

src/BeastConfig.h

@@ -22,6 +22,7 @@
 #endif
 
 #include <beast/container/impl/spookyv2.cpp>
+#include <beast/container/impl/siphash.cpp>
 
 #include <beast/container/tests/aged_associative_container.test.cpp>
 #include <beast/container/tests/buffer_view.test.cpp>

src/README.md

@@ -37,7 +37,7 @@ namespace detail {
 template <
     bool is_const,
     class Iterator,
-    class Base = 
+    class Base =
         std::iterator <
             typename std::iterator_traits <Iterator>::iterator_category,
             typename std::conditional <is_const,
@@ -51,20 +51,46 @@ class aged_container_iterator
 public:
     typedef typename Iterator::value_type::stashed::time_point time_point;
 
+    // Could be '= default', but Visual Studio 2013 chokes on it [Aug 2014]
     aged_container_iterator ()
     {
     }
 
-    template <class OtherIterator, class OtherBase>
+    // copy constructor
+    aged_container_iterator (
+        aged_container_iterator<is_const, Iterator, Base>
+            const& other) = default;
+
+    // Disable constructing a const_iterator from a non-const_iterator.
+    // Converting between reverse and non-reverse iterators should be explicit.
+    template <bool other_is_const, class OtherIterator, class OtherBase,
+        class = typename std::enable_if <
+            (other_is_const == false || is_const == true) &&
+                std::is_same<Iterator, OtherIterator>::value == false>::type>
+    explicit aged_container_iterator (aged_container_iterator <
+        other_is_const, OtherIterator, OtherBase> const& other)
+        : m_iter (other.m_iter)
+    {
+    }
+
+    // Disable constructing a const_iterator from a non-const_iterator.
+    template <bool other_is_const, class OtherBase,
+        class = typename std::enable_if <
+            other_is_const == false || is_const == true>::type>
     aged_container_iterator (aged_container_iterator <
-        false, OtherIterator, OtherBase> const& other)
+        other_is_const, Iterator, OtherBase> const& other)
         : m_iter (other.m_iter)
     {
     }
 
+    // Disable assigning a const_iterator to a non-const iterator
     template <bool other_is_const, class OtherIterator, class OtherBase>
-    aged_container_iterator& operator= (aged_container_iterator <
-        other_is_const, OtherIterator, OtherBase> const& other)
+    auto
+    operator= (aged_container_iterator <
+        other_is_const, OtherIterator, OtherBase> const& other) ->
+            typename std::enable_if <
+                other_is_const == false || is_const == true,
+                    aged_container_iterator&>::type
     {
         m_iter = other.m_iter;
         return *this;