From ea59136b095ca1a34c44b9b0941094b35644b88f Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 12 Oct 2015 18:06:06 -0500 Subject: [PATCH] remove -s (strip) flag for now as it is gcc specific, fix a couple errors clang found --- CMakeLists.txt | 2 +- engine/shared/library/sharedFoundation/src/shared/BitArray.h | 4 ++-- .../src/shared/dynamicVariable/DynamicVariable.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c78cbb4..7e578927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ elseif(UNIX) find_package(Curses REQUIRED) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -g -pipe -Wall -Wno-unknown-pragmas -Wno-reorder -O0") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -march=native -pipe -mtune=native -O2 -s") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -march=native -pipe -mtune=native -O2 ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0") add_definitions(-DLINUX -D_REENTRANT -Dlinux -D_USING_STL -D__STL_NO_BAD_ALLOC -D_GNU_SOURCE -D_XOPEN_SOURCE=500) diff --git a/engine/shared/library/sharedFoundation/src/shared/BitArray.h b/engine/shared/library/sharedFoundation/src/shared/BitArray.h index 4960eea2..70b04b41 100644 --- a/engine/shared/library/sharedFoundation/src/shared/BitArray.h +++ b/engine/shared/library/sharedFoundation/src/shared/BitArray.h @@ -63,8 +63,8 @@ public: void getAsDbTextString(std::string &result, int maxNibbleCount = 32767) const; void setFromDbTextString(const char * text); - friend void Archive::get (ReadIterator &source, BitArray &target); - friend void Archive::put (ByteStream &target, const BitArray &source); + friend void Archive::get (Archive::ReadIterator &source, BitArray &target); + friend void Archive::put (Archive::ByteStream &target, const BitArray &source); private: // *****WARNING***** *****WARNING***** *****WARNING***** *****WARNING***** diff --git a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h index fae07703..004de6fc 100644 --- a/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h +++ b/engine/shared/library/sharedFoundation/src/shared/dynamicVariable/DynamicVariable.h @@ -161,8 +161,8 @@ private: mutable bool m_cachedValueDirty; mutable void * m_cachedValue[2]; - friend void Archive::get(ReadIterator & source, DynamicVariable & target); - friend void Archive::put(ByteStream & target, const DynamicVariable & source); + friend void Archive::get(Archive::ReadIterator & source, DynamicVariable & target); + friend void Archive::put(Archive::ByteStream & target, const DynamicVariable & source); }; //========================================================================