Merge pull request #106 from os12/master

string_view: corrected the comparison

Author: glynos

CMakeLists.txt

@@ -19,12 +19,12 @@ set(CMAKE_VERBOSE_MAKEFILE true)
 
 if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
   INCLUDE(CheckCXXCompilerFlag)
-  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
+  CHECK_CXX_COMPILER_FLAG(-std=c++14 HAVE_STD11)
 
   if (HAVE_STD11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
   else()
-    message(FATAL_ERROR "No C++ 11 support (Compiler does not define -std=c++11).")
+    message(FATAL_ERROR "No C++ 11 support (Compiler does not define -std=c++14).")
   endif()
 
   if (Uri_FULL_WARNINGS)
@@ -37,7 +37,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
 
   message("C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")
 elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
   if (NOT Uri_DISABLE_LIBCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")

include/network/string_view.hpp

@@ -161,7 +161,9 @@ class basic_string_view {
   }
 
   constexpr int compare(basic_string_view s) const noexcept {
-    return traits::compare(data(), s.data(), std::min(size(), s.size()));
+    if (size() != s.size())
+        return size() < s.size() ? -1 : 1;
+    return traits::compare(data(), s.data(), size());
   }
 
   constexpr int compare(size_type pos1, size_type n1,

src/boost/function/function_base.hpp

@@ -308,7 +308,8 @@ namespace network_boost {
           if (op == clone_functor_tag || op == move_functor_tag) {
             const functor_type* in_functor =
               reinterpret_cast<const functor_type*>(&in_buffer.data);
-            new (reinterpret_cast<void*>(&out_buffer.data)) functor_type(*in_functor);
+            void *address = &out_buffer.data;
+            new (address) functor_type(*in_functor);
 
             if (op == move_functor_tag) {
               functor_type* f = reinterpret_cast<functor_type*>(&in_buffer.data);

src/boost/function/function_template.hpp

@@ -569,7 +569,8 @@ namespace network_boost {
         void 
         assign_functor(FunctionObj f, function_buffer& functor, mpl::true_) const
         {
-          new (reinterpret_cast<void*>(&functor.data)) FunctionObj(f);
+          void *address = &functor.data;
+          new (address) FunctionObj(f);
         }
         template<typename FunctionObj,typename Allocator>
         void 

src/uri.cpp

@@ -166,13 +166,13 @@ void uri::initialize(optional<string_type> scheme,
   }
 }
 
-uri::uri() : uri_view_(uri_), uri_parts_() {}
+uri::uri() : uri_view_(uri_) {}
 
-uri::uri(const uri &other) : uri_(other.uri_), uri_view_(uri_), uri_parts_() {
+uri::uri(const uri &other) : uri_(other.uri_), uri_view_(uri_) {
   detail::advance_parts(uri_view_, uri_parts_, other.uri_parts_);
 }
 
-uri::uri(const uri_builder &builder) : uri_parts_() {
+uri::uri(const uri_builder &builder) {
   initialize(builder.scheme_, builder.user_info_, builder.host_, builder.port_,
              builder.path_, builder.query_, builder.fragment_);
 }
@@ -194,11 +194,12 @@ uri &uri::operator=(uri other) {
 }
 
 void uri::swap(uri &other) noexcept {
-  auto parts = uri_parts_;
-  advance_parts(other.uri_view_, uri_parts_, other.uri_parts_);
   uri_.swap(other.uri_);
   uri_view_.swap(other.uri_view_);
-  advance_parts(other.uri_view_, other.uri_parts_, parts);
+
+  const auto this_parts = uri_parts_;
+  detail::advance_parts(uri_view_, uri_parts_, other.uri_parts_);
+  detail::advance_parts(other.uri_view_, other.uri_parts_, this_parts);
 }
 
 uri::const_iterator uri::begin() const noexcept { return uri_view_.begin(); }

test/uri_test.cpp

@@ -444,7 +444,7 @@ TEST(uri_test, swap_test) {
   ASSERT_TRUE(original.has_path());
   EXPECT_EQ("file", original.scheme());
   EXPECT_EQ("", original.host());
-  EXPECT_EQ("/something/different", original.path());
+  EXPECT_EQ("/something/different/", original.path());
 
   ASSERT_TRUE(instance.has_scheme());
   ASSERT_TRUE(instance.has_host());