From: Lessaire
Date: Tue, 21 Apr 2020 10:46:02 -0700
Subject: [PATCH] TFS 0.35 TR1
---
Makefile.am | 2 +-
configure.ac | 2 +-
house.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 19bbc99..9e287d9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ noinst_PROGRAMS = theforgottenserver
CXXFLAGS = -g -O1
AM_CXXFLAGS = $(XML_CPPFLAGS) $(OTSERV_FLAGS) $(LUA_CFLAGS) $(DEBUG_FLAGS)\
$(MYSQL_FLAGS) $(SQLITE_FLAGS) $(ODBC_FLAGS) $(PGSQL_FLAGS)\
-$(PROFILER_FLAGS) $(OPTIONAL_FLAGS) -D_THREAD_SAFE -D_REENTRANT -Wall
+$(PROFILER_FLAGS) $(OPTIONAL_FLAGS) -D_THREAD_SAFE -D_REENTRANT
theforgottenserver_LDADD = $(LUA_LIBS)
diff --git a/configure.ac b/configure.ac
index 4b1019c..5704d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,7 @@ AC_CHECK_LIB(boost_filesystem-gcc-mt, main, , [
AC_CHECK_HEADERS([boost/asio.hpp], , [AC_MSG_ERROR("boost::asio header not found.")])
# check for boost::unordered_set
-AC_CHECK_HEADERS([boost/tr1/unordered_set.hpp], , [AC_MSG_ERROR("boost::unordered_set header not found.")])
+AC_CHECK_HEADERS([boost/unordered_set.hpp], , [AC_MSG_ERROR("boost::unordered_set header not found.")])
#check lua 5.1
PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, , [
diff --git a/house.h b/house.h
index 1129634..641b602 100644
--- a/house.h
+++ b/house.h
@@ -20,7 +20,7 @@
#include "otsystem.h"
#include <boost/regex.hpp>
-#include <boost/tr1/unordered_set.hpp>
+#include <boost/unordered_set.hpp>
#include "position.h"
#include "housetile.h"
@@ -73,7 +73,7 @@ class AccessList
void getList(std::string& _list) const;
private:
- typedef std::tr1::unordered_set<uint32_t> PlayerList;
+ typedef boost::unordered_set<uint32_t> PlayerList;
typedef std::list<std::pair<uint32_t, int32_t> > GuildList;
typedef std::list<std::string> ExpressionList;
typedef std::list<std::pair<boost::regex, bool> > RegExList;
--
2.26.0