fixed some compile issues

Shuozhe · Feb 12, 2017 · bf52d3c · bf52d3c
1 parent ca1f124
commit bf52d3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -12,8 +12,8 @@ GTEST_INCLUDE := libs/gtest/include
 GTEST_LIB := libs/gtest/libgtest.a
 TARGET_DIR := bin
 
-CF := -g0 -O2 -std=c++11 -Werror -Wextra -Wall -funroll-all-loops -ffast-math -Iinclude $(addprefix -I,$(GTEST_INCLUDE))
-LF := -g0 -O2 -Werror -Wextra -Wall -funroll-all-loops -ffast-math
+CF := -g0 -O2 -std=c++11 -Werror -Wextra -Wall -ffast-math -Iinclude $(addprefix -I,$(GTEST_INCLUDE))
+LF := -g0 -O2 -Werror -Wextra -Wall -ffast-math
 
 CCCACHE_USE?=
 CXX?= g++

diff --git a/src/fs/File.cpp b/src/fs/File.cpp
@@ -89,7 +89,7 @@ string File::loadFileToString() const throw(InvalidFileSystemRequest)
    in.read(&data[0], length);
    if (!in.good() || !in.is_open())
       throw InvalidFileSystemRequest("Can not read '" + path + "'");
-   return move(data);
+   return data;
 }
 // -------------------------------------------------------------------------------------------------
 vector<char> File::loadFileToVector() const throw(InvalidFileSystemRequest)