Fix clang build. (vesoft-inc#2358)

Co-authored-by: Shylock Hg <33566796+Shylock-Hg@users.noreply.github.com> Co-authored-by: dutor <440396+dutor@users.noreply.github.com>
grebokcn · Dec 29, 2020 · b7582e2 · b7582e2
1 parent 21ad248
commit b7582e2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/cmake/FindNCURSES.cmake b/cmake/FindNCURSES.cmake
@@ -39,7 +39,7 @@ if(NCURSES_INCLUDE_DIR AND NCURSES_LIBRARY_DIR)
 else()
   FIND_LIBRARY(NCURSES_LIBRARY NAMES ncurses)
   include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(ncurses DEFAULT_MSG NCURSES_INCLUDE_DIR NCURSES_LIBRARY)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(NCURSES DEFAULT_MSG NCURSES_INCLUDE_DIR NCURSES_LIBRARY)
 endif()
 
 mark_as_advanced(

diff --git a/src/common/base/EitherOr.h b/src/common/base/EitherOr.h
@@ -109,10 +109,10 @@ class EitherOr {
     };
 
     template<class... Args>
-    static constexpr auto convert_to_t = TypeConverter<Args...>::type;
+    static constexpr decltype(TypeConverter<Args...>::type) convert_to_t{};
 
     template<class... Args>
-    static constexpr auto convert_to_s = TypeConverter<Args...>::state;
+    static constexpr State convert_to_s = TypeConverter<Args...>::state;
 
 public:
     virtual ~EitherOr() {

diff --git a/src/common/base/StatusOr.h b/src/common/base/StatusOr.h
@@ -21,7 +21,7 @@ class StatusOr final {
 
     // Convenience type traits
     template <typename U>
-    static constexpr auto is_status_v = std::is_same<Status, std::decay_t<U>>::value;
+    static constexpr bool is_status_v = std::is_same<Status, std::decay_t<U>>::value;
 
     // Tell if `U' is of type `StatusOr<V>'
     template <typename U>
@@ -33,7 +33,7 @@ class StatusOr final {
     };
 
     template <typename U>
-    static constexpr auto is_status_or_v = is_status_or<U>::value;
+    static constexpr bool is_status_or_v = is_status_or<U>::value;
 
     // Tell if `T' is initializable from `U'.
     // We simply use `is_constructible_v' for now,
@@ -43,7 +43,7 @@ class StatusOr final {
     // TODO(dutor) we may take other cases into account in future,
     // e.g. convertible but not constructible.
     template <typename U>
-    static constexpr auto is_initializable_v = is_constructible_v<T, U> &&
+    static constexpr bool is_initializable_v = is_constructible_v<T, U> &&
                                                std::is_convertible<U, T>::value &&
                                                !is_status_or_v<U> &&
                                                !is_status_v<U>;

diff --git a/src/common/fs/FileUtils.h b/src/common/fs/FileUtils.h
@@ -251,7 +251,8 @@ class FileUtils final {
 #define CHECK_TYPE(NAME, FTYPE, DTYPE) \
     bool FileUtils::is ## NAME(struct dirent *dEnt, const char* path) { \
         if (dEnt->d_type == DT_UNKNOWN) { \
-            const char* subPath = FileUtils::joinPath(path, dEnt->d_name).c_str(); \
+            auto str = FileUtils::joinPath(path, dEnt->d_name); \
+            const char* subPath = str.c_str(); \
             return FileUtils::fileType(subPath) == FileType::FTYPE; \
         } else { \
             return dEnt->d_type == DT_ ## DTYPE; \

diff --git a/src/console/CmdProcessor.cpp b/src/console/CmdProcessor.cpp
@@ -100,7 +100,8 @@ void CmdProcessor::calColumnWidths(
                 }
                 case cpp2::ColumnValue::Type::double_precision: {
                     int digits10 = std::numeric_limits<double>::digits10;
-                    const char *fmtValue = folly::sformat("%.{}lf", digits10).c_str();
+                    auto str = folly::sformat("%.{}lf", digits10);
+                    const char *fmtValue = str.c_str();
                     GET_VALUE_WIDTH(double, double_precision, fmtValue);
                     if (genFmt) {
                         std::string fmt = folly::sformat(" %%-%ld.{}lf |", digits10);