remove c++14 feature

Change-Id: I88cfd548b7cb2c7c1e1190cc8cc92d1dac729d12
showsmall · Jul 23, 2020 · 0a9dab3 · 0a9dab3
1 parent d985678
commit 0a9dab3
Show file tree

Hide file tree

Showing 31 changed files with 235 additions and 103 deletions.
diff --git a/curvefs_python/BUILD_bak b/curvefs_python/BUILD_bak
@@ -32,7 +32,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_library(

diff --git a/curvesnapshot_python/BUILD_bak b/curvesnapshot_python/BUILD_bak
@@ -32,7 +32,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_library(

diff --git a/nbd/src/BUILD b/nbd/src/BUILD
@@ -32,7 +32,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
     "-I /usr/include/libnl3",
 ]
 

diff --git a/nbd/src/argparse.cpp b/nbd/src/argparse.cpp
@@ -22,7 +22,6 @@
  * Author: yangyaokai
  */
 
-#include <experimental/string_view>
 #include <limits.h>
 #include <string.h>
 #include <string>
@@ -35,13 +34,12 @@
 namespace curve {
 namespace nbd {
 
-using std::experimental::string_view;
 using std::ostringstream;
 
-float strict_strtof(string_view str, std::string *err) {
+float strict_strtof(const char *str, std::string *err) {
     char *endptr;
     errno = 0; /* To distinguish success/failure after call (see man page) */
-    float ret = strtof(str.data(), &endptr);
+    float ret = strtof(str, &endptr);
     if (errno == ERANGE) {
         ostringstream oss;
         oss << "strict_strtof: floating point overflow or underflow parsing '"
@@ -65,15 +63,11 @@ float strict_strtof(string_view str, std::string *err) {
     return ret;
 }
 
-float strict_strtof(const char *str, std::string *err) {
-    return strict_strtof(string_view(str), err);
-}
-
-int64_t strict_strtoll(string_view str, int base, std::string *err) {
+int64_t strict_strtoll(const char *str, int base, std::string *err) {
     char *endptr;
     errno = 0; /* To distinguish success/failure after call (see man page) */
-    int64_t ret = strtoll(str.data(), &endptr, base);
-    if (endptr == str.data() || endptr != str.data() + str.size()) {
+    int64_t ret = strtoll(str, &endptr, base);
+    if (endptr == str || endptr != str + strlen(str)) {
         *err = (std::string {"Expected option value to be integer, got '"} +
                 std::string {str} + "'");
         return 0;
@@ -87,11 +81,7 @@ int64_t strict_strtoll(string_view str, int base, std::string *err) {
     return ret;
 }
 
-int64_t strict_strtoll(const char *str, int base, std::string *err) {
-    return strict_strtoll(string_view(str), base, err);
-}
-
-int strict_strtol(string_view str, int base, std::string *err) {
+int strict_strtol(const char *str, int base, std::string *err) {
     int64_t ret = strict_strtoll(str, base, err);
     if (!err->empty())
         return 0;
@@ -104,10 +94,6 @@ int strict_strtol(string_view str, int base, std::string *err) {
     return static_cast<int>(ret);
 }
 
-int strict_strtol(const char *str, int base, std::string *err) {
-    return strict_strtol(string_view(str), base, err);
-}
-
 struct strict_str_convert {
     const char *str;
     std::string *err;

diff --git a/nbd/src/argparse.h b/nbd/src/argparse.h
@@ -27,6 +27,7 @@
 
 #include <stdarg.h>
 #include <vector>
+#include <string>
 
 namespace curve {
 namespace nbd {

diff --git a/nbd/test/BUILD b/nbd/test/BUILD
@@ -32,7 +32,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
     "-I /usr/include/libnl3",
 ]
 

diff --git a/nbd/test/test_argparse.cpp b/nbd/test/test_argparse.cpp
@@ -0,0 +1,146 @@
+/*
+ *     Copyright (c) 2020 NetEase Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * Project: curve
+ * Created Date: Wed Jul 22 11:19:30 CST 2020
+ * Author: wuhanqing
+ */
+
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+#include <limits>
+#include <string>
+#include "nbd/src/argparse.h"
+
+namespace curve {
+namespace nbd {
+
+std::string Quoted(const std::string& str) {
+    return '\'' + str + '\'';
+}
+
+float strict_strtof(const char* str, std::string* err);
+int64_t strict_strtoll(const char* str, int base, std::string* err);
+int strict_strtol(const char* str, int base, std::string* err);
+
+TEST(TestArgParse, Test_strict_strtof) {
+    std::string error;
+    const std::vector<const char*> validNums = {
+        "1.2345",
+        "-1.2345",
+        "   1"
+    };
+
+    for (const auto& num : validNums) {
+        error.clear();
+        LOG(INFO) << "testing: " << Quoted(num);
+        EXPECT_FLOAT_EQ(std::stof(num), strict_strtof(num, &error));
+        EXPECT_EQ(0, error.size());
+    }
+
+    const std::vector<const char*> invalidNums = {
+        "-1.2 ",  // trailing whitespace is illegal
+        " 1.2 ",
+        "-1.2-1.2",
+        "1  0",
+        "------1.2",
+    };
+
+    for (const auto& num : invalidNums) {
+        error.clear();
+        LOG(INFO) << "testing: " << Quoted(num);
+        EXPECT_FLOAT_EQ(0.0f, strict_strtof(num, &error));
+        ASSERT_NE(0, error.size());
+    }
+}
+
+TEST(TestArgParse, Test_strict_strtol) {
+    std::string error;
+    std::vector<const char*> validNums = {
+        "12345",
+        "-12345",
+        "      12345",
+        "  -12456",
+        "+12345",
+        "+2147483647",
+        "-2147483648",
+    };
+
+    for (const auto& num : validNums) {
+        error.clear();
+        LOG(INFO) << "testing: " << Quoted(num);
+        ASSERT_EQ(std::stol(num), strict_strtol(num, 10, &error));
+        ASSERT_EQ(0, error.size());
+    }
+
+    std::vector<const char*> invalidNums = {
+        "-----------1",
+        "++++++++++++1",
+        "1234567890123124",  // out of range
+        "-1234567890123",    // out of range
+        "12345    ",
+        "12345   1",
+    };
+
+    for (const auto& num : invalidNums) {
+        error.clear();
+        LOG(INFO) << "testing: " << Quoted(num);
+        ASSERT_EQ(0, strict_strtol(num, 10, &error));
+        ASSERT_NE(0, error.size());
+    }
+}
+
+TEST(TestArgParse, Test_strict_strtoll) {
+    std::string error;
+    std::vector<const char*> validNums = {
+        "12345",
+        "-12345",
+        "      12345",
+        "  -12456",
+        "+12345",
+        "+9223372036854775807",
+        "-9223372036854775808",
+    };
+
+    for (const auto& num : validNums) {
+        error.clear();
+        LOG(INFO) << "testing: " << Quoted(num);
+        ASSERT_EQ(std::stoll(num), strict_strtoll(num, 10, &error));
+        ASSERT_EQ(0, error.size());
+    }
+
+    std::vector<const char*> invalidNums = {
+        "-----------1",
+        "++++++++++++1",
+        "9223372036854775808",   // out of range
+        "-9223372036854775809",  // out of range
+        "12345    ",
+        "12345   1",
+    };
+
+    for (const auto& num : invalidNums) {
+        error.clear();
+        LOG(INFO) << "testing: " << Quoted(num);
+        ASSERT_EQ(0, strict_strtoll(num, 10, &error));
+        ASSERT_NE(0, error.size());
+    }
+}
+
+}  // namespace nbd
+}  // namespace curve
diff --git a/nebd/src/part1/BUILD b/nebd/src/part1/BUILD
@@ -21,7 +21,7 @@ COPTS = [
     "-DHAVE_ZLIB",
     "-DHAVE_SSE42",
     "-DNDEBUG",
-    "-std=c++14",
+    "-std=c++11",
     "-pipe",
     "-W",
     "-Wall",

diff --git a/nebd/src/part2/BUILD b/nebd/src/part2/BUILD
@@ -21,7 +21,7 @@ COPTS = [
     "-DHAVE_ZLIB",
     "-DHAVE_SSE42",
     "-DNDEBUG",
-    "-std=c++14",
+    "-std=c++11",
     "-pipe",
     "-W",
     "-Wall",

diff --git a/nebd/src/part2/file_entity.h b/nebd/src/part2/file_entity.h
@@ -30,6 +30,7 @@
 #include <atomic>
 #include <mutex>  // NOLINT
 #include <unordered_map>
+#include <functional>
 
 #include "nebd/src/common/rw_lock.h"
 #include "nebd/src/common/timeutility.h"

diff --git a/src/chunkserver/BUILD b/src/chunkserver/BUILD
@@ -29,7 +29,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_library(

diff --git a/src/chunkserver/copyset_node.cpp b/src/chunkserver/copyset_node.cpp
@@ -103,7 +103,7 @@ int CopysetNode::Init(const CopysetNodeOptions &options) {
     copysetDirPath_.append("/").append(groupId);
     fs_ = options.localFileSystem;
     CHECK(nullptr != fs_) << "local file sytem is null";
-    epochFile_ = std::make_unique<ConfEpochFile>(fs_);
+    epochFile_.reset(new ConfEpochFile(fs_));
 
     chunkDataRpath_ = RAFT_DATA_DIR;
     chunkDataApath_.append("/").append(RAFT_DATA_DIR);

diff --git a/src/client/BUILD b/src/client/BUILD
@@ -32,7 +32,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_library(

diff --git a/src/common/BUILD b/src/common/BUILD
@@ -30,7 +30,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_library(

diff --git a/src/common/concurrent/BUILD b/src/common/concurrent/BUILD
@@ -30,7 +30,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_library(

diff --git a/src/snapshotcloneserver/BUILD b/src/snapshotcloneserver/BUILD
@@ -30,7 +30,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_library(

diff --git a/src/tools/BUILD b/src/tools/BUILD
@@ -1,19 +1,19 @@
-#
-#  Copyright (c) 2020 NetEase Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-
+#
+#  Copyright (c) 2020 NetEase Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
 # tools
 
 # https://docs.bazel.build/versions/master/be/c-cpp.html#cc_library
@@ -33,7 +33,7 @@ COPTS = [
     "-Woverloaded-virtual",
     "-Wnon-virtual-dtor",
     "-Wno-missing-field-initializers",
-    "-std=c++14",
+    "-std=c++11",
 ]
 
 cc_test(