diff --git a/fblualib/build.sh b/fblualib/build.sh index 849bf5a..af028ca 100755 --- a/fblualib/build.sh +++ b/fblualib/build.sh @@ -22,7 +22,7 @@ mkdir -p build cd build cmake .. make -sudo make install +make install rocks="util luaunit complex \ ffivector editline trepl debugger mattorch python thrift torch" @@ -31,5 +31,5 @@ for rock in $rocks; do cd $root/$rock # Unfortunately, luarocks doesn't like separating the "build" and # "install" phases, so we have to run as root. - sudo luarocks make rockspec/fb$rock-$version.rockspec + luarocks make rockspec/fb$rock-$version.rockspec VERBOSE=1 done diff --git a/fblualib/ffivector/CMakeLists.txt b/fblualib/ffivector/CMakeLists.txt index bc9ad68..762ac2f 100644 --- a/fblualib/ffivector/CMakeLists.txt +++ b/fblualib/ffivector/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${FOLLY_INCLUDE_DIR} ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14") SET(src FFIVector.cpp diff --git a/fblualib/ffivector/FFIVector.cpp b/fblualib/ffivector/FFIVector.cpp index 07bd888..3e920fa 100644 --- a/fblualib/ffivector/FFIVector.cpp +++ b/fblualib/ffivector/FFIVector.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include extern "C" { diff --git a/fblualib/mattorch/CMakeLists.txt b/fblualib/mattorch/CMakeLists.txt index e06736e..7dc44cf 100644 --- a/fblualib/mattorch/CMakeLists.txt +++ b/fblualib/mattorch/CMakeLists.txt @@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES( ${MATIO_INCLUDE_DIR} ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14") SET(src MatTorch.cpp diff --git a/fblualib/python/CMakeLists.txt b/fblualib/python/CMakeLists.txt index 6e68b00..0e0be71 100644 --- a/fblualib/python/CMakeLists.txt +++ b/fblualib/python/CMakeLists.txt @@ -63,7 +63,7 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14") SET(src Debug.cpp diff --git a/fblualib/thrift/ChunkedCompression.h b/fblualib/thrift/ChunkedCompression.h index 1c937a5..1c2885d 100644 --- a/fblualib/thrift/ChunkedCompression.h +++ b/fblualib/thrift/ChunkedCompression.h @@ -15,7 +15,7 @@ #include #include -#include +#include #include diff --git a/fblualib/thrift/Encoding.h b/fblualib/thrift/Encoding.h index db471e2..cdef7b4 100644 --- a/fblualib/thrift/Encoding.h +++ b/fblualib/thrift/Encoding.h @@ -11,7 +11,7 @@ #ifndef FBLUA_THRIFT_ENCODING_H_ #define FBLUA_THRIFT_ENCODING_H_ -#include +#include #include #include diff --git a/fblualib/thrift/LuaSerialization.cpp b/fblualib/thrift/LuaSerialization.cpp index 311e85d..cd973ce 100644 --- a/fblualib/thrift/LuaSerialization.cpp +++ b/fblualib/thrift/LuaSerialization.cpp @@ -12,7 +12,7 @@ #include #include "Encoding.h" #include "Serialization.h" -#include +#include using namespace fblualib; using namespace fblualib::thrift; diff --git a/fblualib/torch/CMakeLists.txt b/fblualib/torch/CMakeLists.txt index 1910f36..280fb4d 100644 --- a/fblualib/torch/CMakeLists.txt +++ b/fblualib/torch/CMakeLists.txt @@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(${LUA_INCDIR}) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14") SET(src AsyncRNG.cpp