diff --git a/CMakeLists.txt b/CMakeLists.txt index d51529dcfe8..aa943e43789 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,9 +219,13 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-private-field") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-aligned-allocation-unavailable") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++14-extensions") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-constexpr-not-const") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-braces") endif() if ((APPLE AND (NOT ("${CLANG_VERSION_STRING}" VERSION_LESS "9.0"))) - OR (CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0))) + OR (CMAKE_COMPILER_IS_GNUCXX + AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0 AND NOT APPLE))) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new") endif() if ($ENV{WERROR}) diff --git a/caffe2/core/net_async_polling.h b/caffe2/core/net_async_polling.h index 570d0ec9247..dc807bb04b0 100644 --- a/caffe2/core/net_async_polling.h +++ b/caffe2/core/net_async_polling.h @@ -37,7 +37,7 @@ class AsyncPollingNet : public AsyncNetBase { // Polling std::vector status_; - void reset(); + void reset() override; std::atomic has_chain_failed_; DISABLE_COPY_AND_ASSIGN(AsyncPollingNet);