Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3C39A200C8B for ; Mon, 22 May 2017 22:18:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3ACDC160BBF; Mon, 22 May 2017 20:18:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 81194160BAD for ; Mon, 22 May 2017 22:18:36 +0200 (CEST) Received: (qmail 74711 invoked by uid 500); 22 May 2017 20:18:35 -0000 Mailing-List: contact commits-help@parquet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@parquet.apache.org Delivered-To: mailing list commits@parquet.apache.org Received: (qmail 74702 invoked by uid 99); 22 May 2017 20:18:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 May 2017 20:18:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D4D6DFC2E; Mon, 22 May 2017 20:18:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wesm@apache.org To: commits@parquet.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: parquet-cpp git commit: PARQUET-997: Fix override compiler warnings Date: Mon, 22 May 2017 20:18:35 +0000 (UTC) archived-at: Mon, 22 May 2017 20:18:37 -0000 Repository: parquet-cpp Updated Branches: refs/heads/master b5d9117dd -> 2f351f889 PARQUET-997: Fix override compiler warnings Author: Phillip Cloud 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 Authored: Mon May 22 16:18:29 2017 -0400 Committer: Wes McKinney 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.