Merge branch 'develop'

doc/changes.qbk

@@ -301,6 +301,11 @@ C++11 support has resulted in some breaking changes:
   They are removed in C++17.
 * Support 10 constructor arguments in emplace. It was meant to support up to 10
   arguments, but an off by one error in the preprocessor code meant it only
-  supports up to 10.
+  supported up to 9.
+
+[h2 Boost 1.64.0]
+* Initial support for new C++17 member functions:
+  `insert_or_assign` and `try_emplace` in `unordered_map`,
+  `merge` and `extract` in all containers.
 
 [endsect]

include/boost/unordered/detail/implementation.hpp

@@ -1,6 +1,9 @@
 
 // Copyright (C) 2003-2004 Jeremy B. Maitin-Shepard.
 // Copyright (C) 2005-2016 Daniel James
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #ifndef BOOST_UNORDERED_DETAIL_IMPLEMENTATION_HPP
 #define BOOST_UNORDERED_DETAIL_IMPLEMENTATION_HPP

test/unordered/insert_node_type_fail.cpp

@@ -1,3 +1,8 @@
+
+// Copyright 2017 Daniel James.
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 #include <boost/unordered_map.hpp>
 #include <boost/unordered_set.hpp>