Merge branch 'develop' into develop

Whitespace
Fixing another -Wswitch-enum warning.
2026-01-29 07:32:15 +00:00 · 2019-04-29 15:05:21 -04:00 · 2019-04-29 13:24:59 -04:00 · 2019-04-29 12:29:22 -04:00
1 changed files with 3 additions and 8 deletions
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@@ -400,8 +400,7 @@ namespace boost {
            out_buffer.members.type.type = &boost::typeindex::type_id<functor_type>().type_info();
            out_buffer.members.type.const_qualified = false;
            out_buffer.members.type.volatile_qualified = false;
-          }
-          else {
+          } else {
            manager(in_buffer, out_buffer, op, tag_type());
          }
        }
@@ -507,16 +506,12 @@ namespace boost {
               functor_manager_operation_type op)
        {
          typedef typename get_function_tag<functor_type>::type tag_type;
-          switch (op) {
-          case get_functor_type_tag:
+          if (op == get_functor_type_tag) {
            out_buffer.members.type.type = &boost::typeindex::type_id<functor_type>().type_info();
            out_buffer.members.type.const_qualified = false;
            out_buffer.members.type.volatile_qualified = false;
-            return;
-
-          default:
+          } else {
            manager(in_buffer, out_buffer, op, tag_type());
-            return;
          }
        }
      };
Author	SHA1	Message	Date
jrmarsha	4b25a75c03	Merge branch 'develop' into develop	2019-04-29 15:05:21 -04:00
Josh Marshall	5682111fad	Whitespace	2019-04-29 13:24:59 -04:00
Josh Marshall	1694b32e1b	Fixing another -Wswitch-enum warning.	2019-04-29 12:29:22 -04:00