From f283065cfcdb5c470e398fa9f5dda9afc5d1488e Mon Sep 17 00:00:00 2001
From: cg25 <cg25@a83610d8-ad2a-0410-a6ab-fc0612d85776>
Date: Fri, 21 Aug 2009 20:19:55 +0000
Subject: [PATCH] completely drop BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
 define from all build systems as multi_index is no more used in
 src/file_pool.cpp.

---
 CMakeLists.txt              | 1 -
 Jamfile                     | 1 -
 bindings/python/setup.py.in | 2 +-
 examples/Makefile.am        | 4 ++--
 test/Makefile.am            | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 154355a5b..3f5b86ab5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,7 +214,6 @@ if (MSVC)
 endif(MSVC)
 
 add_definitions(-D_FILE_OFFSET_BITS=64)
-add_definitions(-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION)
 add_definitions(-DBOOST_DISABLE_EXCEPTION)
 
 if (tcmalloc)
diff --git a/Jamfile b/Jamfile
index 713b99643..a2d296d25 100755
--- a/Jamfile
+++ b/Jamfile
@@ -430,7 +430,6 @@ local usage-requirements =
 	<variant>release:<define>NDEBUG
 	<variant>debug:<define>TORRENT_DEBUG
 	<define>_FILE_OFFSET_BITS=64
-	<define>BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
 	<define>BOOST_EXCEPTION_DISABLE
 	<conditional>@linking
 	<zlib>system:<library>zlib-target
diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
index be61fe7a1..b5bd74936 100644
--- a/bindings/python/setup.py.in
+++ b/bindings/python/setup.py.in
@@ -79,6 +79,6 @@ setup( name='python-libtorrent',
 		include_dirs = ['@top_srcdir@/include','@top_srcdir@/include/libtorrent'] + parse_cmd(extra_cmd, '-I'),
 		library_dirs = ['@top_builddir@/src/.libs'] + parse_cmd(extra_cmd, '-L'),
 		extra_link_args = '@LDFLAGS@'.split() + arch(),
-		extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch() + ['-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION'],
+		extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch(),
 		libraries = ['torrent-rasterbar','@BOOST_PYTHON_LIB@'] + parse_cmd(extra_cmd, '-l'))],
 )
diff --git a/examples/Makefile.am b/examples/Makefile.am
index de2e808a7..121f9c553 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -20,6 +20,6 @@ simple_client_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
 enum_if_SOURCES = enum_if.cpp
 enum_if_LDADD = $(top_builddir)/src/libtorrent-rasterbar.la
 
-AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@
 
-AM_LDFLAGS= ${LDLAGS} -L./ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_LDFLAGS@ @SSL_LIBS@
+AM_LDFLAGS= ${LDLAGS} -L./ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@
diff --git a/test/Makefile.am b/test/Makefile.am
index 647ccb763..0afe2735f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,6 +38,6 @@ test_transfer_SOURCES = test_transfer.cpp
 
 LDADD = $(top_builddir)/src/libtorrent-rasterbar.la libtest.la
 
-AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@
 AM_LDFLAGS= @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LDFLAGS@ @SSL_LIBS@