From 33423d43013398e6196d65a0ee8d70d9140f3de6 Mon Sep 17 00:00:00 2001
From: Brandon Castellano <Breakthrough@users.noreply.github.com>
Date: Mon, 28 Jan 2019 15:07:21 -0500
Subject: [PATCH 1/2] Fix compilation issues in detail/flat_tree.hpp.

---
 include/boost/container/detail/flat_tree.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/container/detail/flat_tree.hpp b/include/boost/container/detail/flat_tree.hpp
index db47562..8106a8b 100644
--- a/include/boost/container/detail/flat_tree.hpp
+++ b/include/boost/container/detail/flat_tree.hpp
@@ -1215,14 +1215,14 @@ class flat_tree
    template<class C2>
    BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
    {
-      this->insert( boost::make_move_iterator(source.begin())
+      this->insert_unique( boost::make_move_iterator(source.begin())
                   , boost::make_move_iterator(source.end()));
    }
 
    template<class C2>
    BOOST_CONTAINER_FORCEINLINE void merge_equal(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
    {
-      this->insert( boost::make_move_iterator(source.begin())
+      this->insert_equal( boost::make_move_iterator(source.begin())
                   , boost::make_move_iterator(source.end()));
    }
 

From 38b854b296f4ad4ba0f86366668e69f54ede15e2 Mon Sep 17 00:00:00 2001
From: Brandon Castellano <Breakthrough@users.noreply.github.com>
Date: Mon, 28 Jan 2019 19:59:59 -0500
Subject: [PATCH 2/2] Restore indentation.

---
 include/boost/container/detail/flat_tree.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/container/detail/flat_tree.hpp b/include/boost/container/detail/flat_tree.hpp
index 8106a8b..476a63a 100644
--- a/include/boost/container/detail/flat_tree.hpp
+++ b/include/boost/container/detail/flat_tree.hpp
@@ -1216,14 +1216,14 @@ class flat_tree
    BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
    {
       this->insert_unique( boost::make_move_iterator(source.begin())
-                  , boost::make_move_iterator(source.end()));
+                         , boost::make_move_iterator(source.end()));
    }
 
    template<class C2>
    BOOST_CONTAINER_FORCEINLINE void merge_equal(flat_tree<Value, KeyOfValue, C2, AllocatorOrContainer>& source)
    {
       this->insert_equal( boost::make_move_iterator(source.begin())
-                  , boost::make_move_iterator(source.end()));
+                        , boost::make_move_iterator(source.end()));
    }
 
    BOOST_CONTAINER_FORCEINLINE void merge_unique(flat_tree& source)