Convert plasma/plasma_store.cc to use STL (#324)

* Change plasma_store.c to C++ (clobbering existing FlatBuffers usage). * Convert plasma_store.cc to use STL (with a caveat) * Fix CMakeLists and mutation-while-iterating problem * Remove extra extern "C" declarations * Remove redundant -std=c++11 from plasma/CMakeLists.txt
ray-project · Apr 1, 2017 · 227c916 · 227c916
1 parent f1b48f2
commit 227c916
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 156 deletions.
diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
@@ -5,15 +5,14 @@ project(plasma)
 # Recursively include common
 include(${CMAKE_CURRENT_LIST_DIR}/../common/cmake/Common.cmake)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 if(APPLE)
  SET(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
 endif(APPLE)
 
 include_directories("${PYTHON_INCLUDE_DIRS}" thirdparty)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200809L")
 
 # Compile flatbuffers