Merge pull request #5 from Conzxy/dist

Dist
Conzxy · Apr 5, 2023 · c4eca26 · c4eca26
2 parents 082d8fe + 7774c0a
commit c4eca26
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/cmake/compile_flag.cmake b/cmake/compile_flag.cmake
@@ -25,7 +25,7 @@ else ()
    -Wno-format-security
    # support INT2DOUBLE
    -Wno-strict-aliasing
-   -Werror
+   #-Werror
    # make non-trivial(but like "trivial") class can reallocate
    -Wno-class-memaccess
    -Wno-implicit-fallthrough

diff --git a/mmkv/CMakeLists.txt b/mmkv/CMakeLists.txt
@@ -95,6 +95,7 @@ target_include_directories(mmkv-server
   PRIVATE ${CHISATO_DIR}
   PRIVATE ${PROJECT_SOURCE_DIR}
   PRIVATE ${XXHASH_DIR}
+  PRIVATE ${HKLUA_DIR}
 )
 
 mmkv_gen_app(rlogdump SOURCES ${RLOG_DUMP_SRC} LIBS ${MMKV_COMMON_LIBS})

diff --git a/mmkv/util/conc_util.cc b/mmkv/util/conc_util.cc
@@ -18,7 +18,7 @@ int mmkv::util::GetCoreNum()
   static int ret = 1;
 #endif
 #ifdef _SC_NPROCESSORS_ONLN
-  static ret = sysconf(_SC_NPROCESSORS_ONLN);
+  static int ret = sysconf(_SC_NPROCESSORS_ONLN);
 #endif
 
   return ret;

diff --git a/mmkv/util/time_util.h b/mmkv/util/time_util.h
@@ -59,7 +59,10 @@ inline double GetTimeFloatSec() noexcept
  *  negative -- failure
  *  otherwise, success
  */
-inline int64_t GetTimeSec() noexcept { return ::time(NULL); }
+inline int64_t GetTimeSec() noexcept
+{
+  return ::time(NULL);
+}
 
 } // namespace util
 

diff --git a/third-party/hklua b/third-party/hklua
diff --git a/third-party/kanon b/third-party/kanon
diff --git a/third-party/replxx b/third-party/replxx
diff --git a/third-party/takina b/third-party/takina