Fix compare() in string_view

starmaker-dev · starmaker-dev · commit d33e8087cbf7 · 2018-08-13T15:54:05.000+08:00
diff --git a/include/network/string_view.hpp b/include/network/string_view.hpp
@@ -161,8 +161,12 @@ class basic_string_view {
   }
 
   constexpr int compare(basic_string_view s) const noexcept {
-    return (size() != s.size()) ? (size() < s.size()) ? -1 : 1
-                                : traits::compare(data(), s.data(), size());
+    return size() == s.size()
+               ? traits::compare(data(), s.data(), size())
+               : (size() < s.size()
+                      ? (traits::compare(data(), s.data(), size()) > 0 ? 1 : -1)
+                      : (traits::compare(data(), s.data(), size()) < 0 ? -1
+                                                                       : 1));
   }
 
   constexpr int compare(size_type pos1, size_type n1,

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,12 @@ class basic_string_view {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`constexpr int compare(basic_string_view s) const noexcept {`
`164`		`- return (size() != s.size()) ? (size() < s.size()) ? -1 : 1`
`165`		`- : traits::compare(data(), s.data(), size());`
	`164`	`+ return size() == s.size()`
	`165`	`+ ? traits::compare(data(), s.data(), size())`
	`166`	`+ : (size() < s.size()`
	`167`	`+ ? (traits::compare(data(), s.data(), size()) > 0 ? 1 : -1)`
	`168`	`+ : (traits::compare(data(), s.data(), size()) < 0 ? -1`
	`169`	`+ : 1));`
`166`	`170`	`}`
`167`	`171`
`168`	`172`	`constexpr int compare(size_type pos1, size_type n1,`