Repository: arrow
Updated Branches:
  refs/heads/master e209e5865 -> 6768f5268


ARROW-1139: Silence dlmalloc warning on clang-4.0

An alternative would be to patch dlmalloc similarly to 
https://github.com/greg7mdp/dlmalloc

Author: Philipp Moritz <pcmor...@gmail.com>

Closes #769 from pcmoritz/dlmalloc-fix and squashes the following commits:

6602c7f5 [Philipp Moritz] clean up
672ec2ee [Philipp Moritz] fix on g++
fd91ccdb [Philipp Moritz] silence dlmalloc warnings on clang-4.0


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/6768f526
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/6768f526
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/6768f526

Branch: refs/heads/master
Commit: 6768f5268700aebdd4e5fe6a99ca5c912640ca82
Parents: e209e58
Author: Philipp Moritz <pcmor...@gmail.com>
Authored: Fri Jun 23 12:56:36 2017 -0400
Committer: Wes McKinney <wes.mckin...@twosigma.com>
Committed: Fri Jun 23 12:56:36 2017 -0400

----------------------------------------------------------------------
 cpp/src/plasma/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/6768f526/cpp/src/plasma/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/src/plasma/CMakeLists.txt b/cpp/src/plasma/CMakeLists.txt
index 992c33e..8f2d81f 100644
--- a/cpp/src/plasma/CMakeLists.txt
+++ b/cpp/src/plasma/CMakeLists.txt
@@ -67,7 +67,6 @@ endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
-set_source_files_properties(thirdparty/dlmalloc.c PROPERTIES COMPILE_FLAGS 
-Wno-all)
 set_source_files_properties(extension.cc PROPERTIES COMPILE_FLAGS 
-Wno-strict-aliasing)
 
 set(PLASMA_SRCS
@@ -91,7 +90,7 @@ ADD_ARROW_LIB(plasma
 
 # The optimization flag -O3 is suggested by dlmalloc.c, which is #included in
 # malloc.cc; we set it here regardless of whether we do a debug or release 
build.
-set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS 
"-Wno-error=conversion -O3")
+set_source_files_properties(malloc.cc PROPERTIES COMPILE_FLAGS "-Wno-error 
-O3")
 
 add_executable(plasma_store store.cc)
 target_link_libraries(plasma_store plasma_static)

Reply via email to