From 0f9cfc06150af1aa7b87c84077e48d05dc54c956 Mon Sep 17 00:00:00 2001 From: KimLS Date: Wed, 15 Oct 2014 22:15:24 -0700 Subject: [PATCH 1/4] Very new versions of gcc appear to have now cleaned up yet another header leaking out --- luabind/luabind/detail/object_rep.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/luabind/luabind/detail/object_rep.hpp b/luabind/luabind/detail/object_rep.hpp index dafa6532a..93b3e39d6 100644 --- a/luabind/luabind/detail/object_rep.hpp +++ b/luabind/luabind/detail/object_rep.hpp @@ -28,6 +28,7 @@ #include #include #include +#include namespace luabind { namespace detail { From 9c6ab056596e5ea79b0e073f883b2d24d3c47c57 Mon Sep 17 00:00:00 2001 From: KimLS Date: Thu, 16 Oct 2014 01:05:43 -0700 Subject: [PATCH 2/4] Removed PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP ifdef, we dont use it anyway and it was failing on FreeBSD gcc49 --- common/unix.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/unix.h b/common/unix.h index c78d05cb2..d4155f946 100644 --- a/common/unix.h +++ b/common/unix.h @@ -18,9 +18,6 @@ #ifndef _WINDOWS #ifndef __UNIX_H__ #define __UNIX_H__ - #ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - #define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP {0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, __LOCK_INITIALIZER} - #endif #include typedef int SOCKET; From 4cf845e6fff3c748505a48e3673e6997afe2ddb6 Mon Sep 17 00:00:00 2001 From: KimLS Date: Thu, 16 Oct 2014 01:16:38 -0700 Subject: [PATCH 3/4] Workaround for FreeBSD not having std::to_string --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a975ef533..4e2f5f9e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,6 +126,7 @@ ENDIF(MSVC) IF(UNIX) IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ADD_DEFINITIONS(-DFREEBSD) + ADD_DEFINITIONS(-D_GLIBCXX_USE_C99) SET(FREEBSD TRUE) ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") IF(CMAKE_SYSTEM_NAME MATCHES "Darwin") From 7ca23d14c7f1ecd9a8ac53d33d478f9874c50619 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 16 Oct 2014 17:01:06 -0400 Subject: [PATCH 4/4] Remove debug statement --- zone/raids.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/zone/raids.cpp b/zone/raids.cpp index 0adbcdef1..c0879eca6 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -262,7 +262,6 @@ void Raid::SaveRaidLeaderAA() { char *queryBuffer = new char[sizeof(RaidLeadershipAA_Struct) * 2 + 1]; database.DoEscapeString(queryBuffer, (char*)&raid_aa, sizeof(RaidLeadershipAA_Struct)); - _hex(NET__ERROR, queryBuffer, sizeof(RaidLeadershipAA_Struct)); std::string query = "UPDATE raid_leaders SET leadershipaa = '"; query += queryBuffer;