You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by we...@apache.org on 2017/05/22 20:18:35 UTC
parquet-cpp git commit: PARQUET-997: Fix override compiler warnings
Repository: parquet-cpp
Updated Branches:
refs/heads/master b5d9117dd -> 2f351f889
PARQUET-997: Fix override compiler warnings
Author: Phillip Cloud <cp...@gmail.com>
Closes #338 from cpcloud/PARQUET-997 and squashes the following commits:
74acf45 [Phillip Cloud] PARQUET-997: Fix override compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/2f351f88
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/2f351f88
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/2f351f88
Branch: refs/heads/master
Commit: 2f351f8895d72d23d7c9ce51a6c7d2facff6a1cf
Parents: b5d9117
Author: Phillip Cloud <cp...@gmail.com>
Authored: Mon May 22 16:18:29 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Mon May 22 16:18:29 2017 -0400
----------------------------------------------------------------------
CMakeLists.txt | 10 ++++++++--
src/parquet/compression.h | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/2f351f88/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3728a0c..02700c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,12 @@ string(REPLACE "\n" "" PARQUET_VERSION "${PARQUET_VERSION}")
include(ExternalProject)
include(FindPkgConfig)
+# This ensures that things like gnu++11 get passed correctly
+set(CMAKE_CXX_STANDARD 11)
+
+# We require a C++11 compliant compiler
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
if(CMAKE_MAJOR_VERSION LESS 3)
set(CMAKE_INSTALL_INCLUDEDIR "include")
set(CMAKE_INSTALL_LIBDIR "lib")
@@ -404,9 +410,9 @@ message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
set(CMAKE_CXX_FLAGS "${PARQUET_CXXFLAGS} ${CMAKE_CXX_FLAGS}")
if (MSVC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing -Wall")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing -Wall")
endif()
if (PARQUET_USE_SSE)
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/2f351f88/src/parquet/compression.h
----------------------------------------------------------------------
diff --git a/src/parquet/compression.h b/src/parquet/compression.h
index f0a38b6..c1a3bf4 100644
--- a/src/parquet/compression.h
+++ b/src/parquet/compression.h
@@ -55,7 +55,7 @@ class PARQUET_EXPORT SnappyCodec : public Codec {
int64_t MaxCompressedLen(int64_t input_len, const uint8_t* input) override;
- const char* name() const { return "snappy"; }
+ const char* name() const override { return "snappy"; }
};
// Brotli codec.