Manual changes to update style and fix breakages

cpp-netlib · glynos · Nov 18, 2015 · Oct 28, 2015 · Oct 28, 2015 · Oct 31, 2015
commit 44bd36b4243494c99ed98f09c93faf772a42ca77
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
@@ -17,7 +17,7 @@
     '-Wall',
     '-Wextra',
     '-Werror',
-    '-std=c++03',
+    '-std=c++11',
     '-isystem',
     '.',
     '-isystem',

diff --git a/boost/network/detail/directive_base.hpp b/boost/network/detail/directive_base.hpp
@@ -7,6 +7,8 @@
 #ifndef __NETWORK_DETAIL_DIRECTIVE_BASE_HPP__
 #define __NETWORK_DETAIL_DIRECTIVE_BASE_HPP__
 
+#include <boost/network/message_fwd.hpp>
+
 /** Defines the base type from which all directives inherit
  * to allow friend access to message and other types' internals.
  */
@@ -17,12 +19,13 @@ namespace detail {
 template <class Tag>
 struct directive_base {
   typedef Tag tag;
-  // explicit directive_base(basic_message<tag> & message_)
-  //    : _message(message_)
+  explicit directive_base(basic_message<tag> & message)
+      : message_(message) {}
+
  protected:
-  ~directive_base() = default;default;;  // can only be extended
+  ~directive_base() = default;  // can only be extended
 
-  //    mutable basic_message<tag> & _message;
+  basic_message<tag> & message_;
 };
 
 }  // namespace detail

diff --git a/boost/network/detail/wrapper_base.hpp b/boost/network/detail/wrapper_base.hpp
@@ -17,8 +17,7 @@ struct wrapper_base {
   explicit wrapper_base(Message& message_) : _message(message_) {};
 
  protected:
-  ~wrapper_base() = default;default;;  // for extending only
-
+  ~wrapper_base() = default;  // for extending only
   Message& _message;
 };
 
@@ -27,8 +26,7 @@ struct wrapper_base_const {
   explicit wrapper_base_const(Message const& message_) : _message(message_) {}
 
  protected:
-  ~wrapper_base_const() = default;default;;  // for extending only
-
+  ~wrapper_base_const() = default;  // for extending only
   Message const& _message;
 };
 

diff --git a/boost/network/message.hpp b/boost/network/message.hpp
@@ -8,7 +8,7 @@
 
 #include <boost/network/message_fwd.hpp>
 #include <boost/network/traits/string.hpp>
-#include <boost/utility/enable_if.hpp>boost/network/traits/headers_container.hpp>
+#include <boost/utility/enable_if.hpp>
 #include <boost/network/detail/directive_base.hpp>
 #include <boost/network/detail/wrapper_base.hpp>
 #include <boost/network/message/directives.hpp>

diff --git a/boost/network/message/directives/detail/string_directive.hpp b/boost/network/message/directives/detail/string_directive.hpp
@@ -6,12 +6,14 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/network/support/is_pod.hpp>
 #include <boost/network/traits/string.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/static_visitor.hpp>
 #include <boost/variant/variant.hpp>
-#include <boost/network/support/is_pod.hpp>>
-#include <boost/variant/apply_visitor.hpp>#include <boost/variant/static_visitor.hpp>
-#include <boost/mpl/if.hpp<boost/mpl/or.hpp>
-#include <boost/utility/enable_if.hpp>ble_if.hpp>
 
 /**
  *
@@ -32,7 +34,7 @@
 #define BOOST_NETWORK_STRING_DIRECTIVE(name, value, body, pod_body)         \
   template <class ValueType>                                                \
   struct name##_directive {                                                 \
-    ValueType const& ((value));                                                 \
+    ValueType const&((value));                                              \
     explicit name##_directive(ValueType const& value_) : value(value_) {}   \
     name##_directive(name##_directive const& other) : value(other.value) {} \
     template <class Tag, template <class> class Message>                    \
@@ -51,7 +53,5 @@
   inline name##_directive<T> name(T const& input) {                         \
     return name##_directive<T>(input);                                      \
   }
-#endif /* BOOST_NETWORK_STRING_DIRECTIVE */
-
-#endif /* BOOST_NETWORK_MESSAGE_DIRECTIVES_DETAIL_STRING_DIRECTIVE_HPP_20100915 \
-          */
+#endif  // BOOST_NETWORK_STRING_DIRECTIVE
+#endif  // BOOST_NETWORK_MESSAGE_DIRECTIVES_DETAIL_STRING_DIRECTIVE_HPP_20100915
diff --git a/boost/network/message/directives/header.hpp b/boost/network/message/directives/header.hpp
@@ -4,16 +4,20 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef __NETWORK_MESSAGE_DIRECTIVES_HEADER_HPP__
-#define __NETWORK_MESSAGE_DIRECTIVES_HEADER_HPP__
+#ifndef BOOST_NETWORK_MESSAGE_DIRECTIVES_HEADER_HPP__
+#define BOOST_NETWORK_MESSAGE_DIRECTIVES_HEADER_HPP__
 
-#include <boost/network/support/is_async.hpp>pp>
-#include <boost/network/traits/string.hpp>nclude <boost/utility/enable_if.hpp>ude <boost/thread/future.hpp>
+#include <boost/network/support/is_async.hpp>
+#include <boost/network/traits/string.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/or.hpp>
-#include <boost/variant/apply_visitor.hpp>r.hpp>
-#include <boost/variant/static_visitor.hpp>>
-#include <boost/variant/variant.hpp>pace boost {
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/variant.hpp>
+
+namespace boost {
 namespace network {
 
 namespace impl {
@@ -69,4 +73,4 @@ inline impl::header_directive<T1, T2> header(T1 const& header_name,
 }  // namespace network
 }  // namespace boost
 
-#endif  // __NETWORK_MESSAGE_DIRECTIVES_HEADER_HPP__
+#endif  // BOOST_NETWORK_MESSAGE_DIRECTIVES_HEADER_HPP__
diff --git a/boost/network/message/directives/remove_header.hpp b/boost/network/message/directives/remove_header.hpp
@@ -8,6 +8,7 @@
 #define NETWORK_MESSAGE_DIRECTIVES_REMOVE_HEADER_HPP
 
 #include <boost/network/traits/string.hpp>
+#include <string>
 
 namespace boost {
 namespace network {
@@ -34,14 +35,15 @@ struct remove_header_directive {
 }  // namespace impl
 
 inline impl::remove_header_directive<std::string> remove_header(
-    std::string  /*header_name*/ame*/) {
+    const std::string& header_name) {
   return impl::remove_header_directive<std::string>(header_name);
 }
 
 inline impl::remove_header_directive<std::wstring> remove_header(
-    std::wstring header_name) {
+    const std::wstring& header_name) {
   return impl::remove_header_directive<std::wstring>(header_name);
 }
+
 }  // namespace network
 }  // namespace boost
 

diff --git a/boost/network/message/message_concept.hpp b/boost/network/message/message_concept.hpp
@@ -14,7 +14,11 @@
 #include <boost/network/message/traits/source.hpp>
 #include <boost/network/message/traits/destination.hpp>
 #include <boost/network/message/traits/headers.hpp>
-#include <boost/network/tags.hp<boost/network/traits/string.hpp>de <boost/thread/future.hpp>oost {
+#include <boost/network/tags.hpp>
+#include <boost/network/traits/string.hpp>
+#include <boost/thread/future.hpp>
+
+namespace boost {
 namespace network {
 
 template <class M>

diff --git a/boost/network/message/modifiers/add_header.hpp b/boost/network/message/modifiers/add_header.hpp
@@ -7,9 +7,11 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/mpl/a<boost/mpl/not<boost/network/support/is_async.hpp>nc.hpp>
-#include <boost/network/support/is_pod.hpp>ort/is_pod.hpp>
-#include <boost/utility/enable_if.hpp>le_if.hpp>
+#include <boost/mpl/and.hpp>
+#include <boost/mpl/not.hpp>
+#include <boost/network/support/is_async.hpp>
+#include <boost/network/support/is_pod.hpp>
+#include <boost/utility/enable_if.hpp>
 
 namespace boost {
 namespace network {
@@ -36,7 +38,7 @@ inline typename enable_if<is_pod<Tag>, void>::type add_header(
   typename Message::header_type header = {key, value};
   message.headers.insert(message.headers.end(), header);
 }
-} // namespace impl  // namespace impl
+}  // namespace impl
 
 template <class Tag, template <class> class Message, class KeyType,
           class ValueType>

diff --git a/boost/network/message/modifiers/clear_headers.hpp b/boost/network/message/modifiers/clear_headers.hpp
@@ -6,10 +6,12 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/mpl/a<boost/mpl/not<boost/network/support/is_async.hpp>_async.hpp>
-#include <boost/network/support/is_pod.hpp>.hpp>
-#include <boost/thread/future.hpp>e.hpp>
-#include <boost/utility/enable_if.hpp>le_if.hpp>
+#include <boost/mpl/and.hpp>
+#include <boost/mpl/not.hpp>
+#include <boost/network/support/is_async.hpp>
+#include <boost/network/support/is_pod.hpp>
+#include <boost/thread/future.hpp>
+#include <boost/utility/enable_if.hpp>
 
 namespace boost {
 namespace network {

diff --git a/boost/network/message/modifiers/remove_header.hpp b/boost/network/message/modifiers/remove_header.hpp
@@ -7,11 +7,12 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/mpl/not.hpp>
 #include <boost/network/support/is_async.hpp>
 #include <boost/network/support/is_pod.hpp>
-#include <boost/range/algorithm/remove_if.hpp>_if.hpp>
-#include <boost/utility/enable_if.hpp>e <boost/algorithm/string/predicate.hpp>
-#include <boost/mpl/not.hpp>
+#include <boost/range/algorithm/remove_if.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 
 namespace boost {
 namespace network {
@@ -38,7 +39,7 @@ struct iequals_pred {
   iequals_pred(KeyType const& key) : key(key) {}
   template <class Header>
   bool operator()(Header& other) const {
-    return boost::iequals(key, name(other));
+    return boost::algorithm::iequals(key, name(other));
   }
 };
 

diff --git a/boost/network/message/traits/body.hpp b/boost/network/message/traits/body.hpp
@@ -7,10 +7,12 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/mpl<boost/mpl/<boost/network/support/is_async.hpp>.hpp>
-#include <boost/network/support/is_sync.hpp>_sync.hpp>
-#include <boost/thread/future.hpp>re.hpp>
-#include <boost/type_traits/is_same.hpp>/is_same.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/network/traits/string.hpp>
+#include <boost/network/support/is_async.hpp>
+#include <boost/network/support/is_sync.hpp>
+#include <boost/thread/future.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace boost {
 namespace network {
@@ -33,13 +35,7 @@ struct body
               unsupported_tag<typename Message::tag> >::type> {};
 
 }  // namespace traits
-
 }  // namespace network
-  // namespace network
- /* network */
-
 }  // namespace boost
- // namespace boost
- /* boost */
 
 #endif  // BOOST_NETWORK_MESSAGE_TRAITS_BODY_HPP_20100903
diff --git a/boost/network/message/traits/destination.hpp b/boost/network/message/traits/destination.hpp
@@ -7,10 +7,12 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/mpl<boost/network/support/is_async.hpp>>
-#include <boost/network/support/is_sync.hpp>hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/network/support/is_async.hpp>
+#include <boost/network/support/is_sync.hpp>
+#include <boost/network/traits/string.hpp>
 #include <boost/thread/future.hpp>
-#include <boost/type_traits/is_same.hpp>/is_same.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace boost {
 namespace network {
@@ -33,13 +35,7 @@ struct destination
               unsupported_tag<typename Message::tag> >::type> {};
 
 }  // namespace traits
-
-} // namespace network
- // namespace network
- /* network */
-
+}  // namespace network
 }  // namespace boost
- // namespace boost
- /* boost */
 
 #endif  // BOOST_NETWORK_MESSAGE_TRAITS_DESTINATION_HPP_20100903
diff --git a/boost/network/message/traits/headers.hpp b/boost/network/message/traits/headers.hpp
@@ -7,11 +7,13 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/mpl/if.hpp>ude <boost/mpl/or<boost/network/message/directives.hpp>p>
-#include <boost/network/message/transformers.hpp>.hpp>
-#include <boost/network/message/wrappers.hpp>appers.hpp>
-#include <boost/network/support/is_async.hpp>port/is_async.hpp>
-#include <boost/network/support/is_sync.hpp>port/is_sync.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/network/message/directives.hpp>
+#include <boost/network/message/transformers.hpp>
+#include <boost/network/message/wrappers.hpp>
+#include <boost/network/support/is_async.hpp>
+#include <boost/network/support/is_sync.hpp>
 
 namespace boost {
 namespace network {
@@ -46,13 +48,7 @@ struct header_value
               unsupported_tag<typename Message::tag> >::type> {};
 
 }  // namespace traits
-
-} // namespace network
-  // namespace network
- /* network */
-
+}  // namespace network
 }  // namespace boost
- // namespace boost
- /* boost */
 
 #endif  // BOOST_NETWORK_MESSAGE_TRAITS_HEADERS_HPP_20100903
diff --git a/boost/network/message/traits/source.hpp b/boost/network/message/traits/source.hpp
@@ -6,14 +6,15 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/mpl<boost/network/support/is_async.hpp>>
-#include <boost/network/support/is_sync.hpp>hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/network/support/is_async.hpp>
+#include <boost/network/support/is_sync.hpp>
+#include <boost/network/traits/string.hpp>
 #include <boost/thread/future.hpp>
-#include <boost/type_traits/is_same.hpp>/is_same.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace boost {
 namespace network {
-
 namespace traits {
 
 template <class Tag>
@@ -32,13 +33,7 @@ struct source
               unsupported_tag<typename Message::tag> >::type> {};
 
 }  // namespace traits
-
 }  // namespace network
- // namespace network
- /* network */
-
-} // namespace boost
-  // namespace boost
- /* boost */
+}  // namespace boost
 
 #endif  // BOOST_NETWORK_MESSAGE_TRAITS_SOURCE_HPP_20100903