Updated to Boost 1.43

6 files changed, 36 insertions, 32 deletions

diff --git a/acprep b/acprep
index a611e3e9..b7c5e177 100755
--- a/acprep
+++ b/acprep
@@ -1122,13 +1122,13 @@ class PrepareBuild(CommandLineApp):
                 self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags')
                 self.CPPFLAGS.append('-D_GLIBCXX_DEBUG=1')
 
-            if self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_42_0',
-                                         suffix       = '-xgcc44-sd-1_42',
-                                         include_path = 'include/boost-1_42'):
+            if self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_43_0',
+                                         suffix       = '-xgcc44-sd-1_43',
+                                         include_path = 'include/boost-1_43'):
                 pass
-            elif self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_42_0',
-                                           suffix       = '-xgcc44-d-1_42',
-                                           include_path = 'include/boost-1_42'):
+            elif self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_43_0',
+                                           suffix       = '-xgcc44-d-1_43',
+                                           include_path = 'include/boost-1_43'):
                 pass
             elif self.boost_info.configure(suffix = '-d'):
                 pass
@@ -1136,13 +1136,13 @@ class PrepareBuild(CommandLineApp):
         else:
             if self.boost_info.configure():
                 pass
-            elif self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_42_0',
-                                           suffix       = '-xgcc44-s-1_42',
-                                           include_path = 'include/boost-1_42'):
+            elif self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_43_0',
+                                           suffix       = '-xgcc44-s-1_43',
+                                           include_path = 'include/boost-1_43'):
                 pass
-            elif self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_42_0',
-                                           suffix       = '-xgcc44-1_42',
-                                           include_path = 'include/boost-1_42'):
+            elif self.boost_info.configure(home_path    = '/usr/local/stow/boost_1_43_0',
+                                           suffix       = '-xgcc44-1_43',
+                                           include_path = 'include/boost-1_43'):
                 pass
 
     def setup_flavor_default(self):
diff --git a/lib/Makefile b/lib/Makefile
index f0f2b3d1..14605176 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -12,7 +12,7 @@ CPPFLAGS      = -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
 CFLAGS        = $(CPPFLAGS) -g
 LDFLAGS       = -g
 
-BOOST_VERSION = 1_42_0
+BOOST_VERSION = 1_43_0
 BOOST_SOURCE  = boost_$(BOOST_VERSION)
 BOOST_TOOLSET = darwin
 BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 define=_GLIBCXX_FULLY_DYNAMIC_STRING=1
diff --git a/src/py_account.cc b/src/py_account.cc
index 3114cc0b..2b860a24 100644
--- a/src/py_account.cc
+++ b/src/py_account.cc
@@ -207,11 +207,11 @@ void export_account()
     .def("__len__", accounts_len)
     .def("__getitem__", accounts_getitem, return_internal_reference<>())
 
-    .def("__iter__", range<return_internal_reference<> >
+    .def("__iter__", python::range<return_internal_reference<> >
 	 (&account_t::accounts_begin, &account_t::accounts_end))
-    .def("accounts", range<return_internal_reference<> >
+    .def("accounts", python::range<return_internal_reference<> >
 	 (&account_t::accounts_begin, &account_t::accounts_end))
-    .def("posts", range<return_internal_reference<> >
+    .def("posts", python::range<return_internal_reference<> >
 	 (&account_t::posts_begin, &account_t::posts_end))
 
     .def("has_xdata", &account_t::has_xdata)
diff --git a/src/py_commodity.cc b/src/py_commodity.cc
index 22a4f153..d89a7151 100644
--- a/src/py_commodity.cc
+++ b/src/py_commodity.cc
@@ -295,13 +295,16 @@ void export_commodity()
     .def("keys", py_pool_keys)
     .def("has_key", py_pool_contains)
     .def("__contains__", py_pool_contains)
-    .def("__iter__", range<return_value_policy<reference_existing_object> >
+    .def("__iter__",
+	 python::range<return_value_policy<reference_existing_object> >
 	 (py_pool_commodities_begin, py_pool_commodities_end))
-    .def("iteritems", range<return_value_policy<reference_existing_object> >
+    .def("iteritems",
+	 python::range<return_value_policy<reference_existing_object> >
 	 (py_pool_commodities_begin, py_pool_commodities_end))
-    .def("iterkeys", range<>(py_pool_commodities_keys_begin,
-			     py_pool_commodities_keys_end))
-    .def("itervalues", range<return_value_policy<reference_existing_object> >
+    .def("iterkeys", python::range<>(py_pool_commodities_keys_begin,
+				     py_pool_commodities_keys_end))
+    .def("itervalues",
+	 python::range<return_value_policy<reference_existing_object> >
 	 (py_pool_commodities_values_begin, py_pool_commodities_values_end))
     ;
 
diff --git a/src/py_journal.cc b/src/py_journal.cc
index 81ce290d..1848adc4 100644
--- a/src/py_journal.cc
+++ b/src/py_journal.cc
@@ -226,8 +226,8 @@ void export_journal()
   class_< collect_posts, bases<item_handler<post_t> >,
           shared_ptr<collect_posts>, boost::noncopyable >("PostCollector")
     .def("__len__", &collect_posts::length)
-    .def("__iter__", range<return_internal_reference<1,
-	                     with_custodian_and_ward_postcall<1, 0> > >
+    .def("__iter__", python::range<return_internal_reference<1,
+	                           with_custodian_and_ward_postcall<1, 0> > >
 	 (&collect_posts::begin, &collect_posts::end))
     ;
 
@@ -236,8 +236,9 @@ void export_journal()
     .def("__len__", &collector_wrapper::length)
     .def("__getitem__", posts_getitem, return_internal_reference<1,
 	                     with_custodian_and_ward_postcall<0, 1> >())
-    .def("__iter__", range<return_value_policy<reference_existing_object,
-	                     with_custodian_and_ward_postcall<0, 1> > >
+    .def("__iter__",
+	 python::range<return_value_policy<reference_existing_object,
+		       with_custodian_and_ward_postcall<0, 1> > >
 	 (&collector_wrapper::begin, &collector_wrapper::end))
     ;
 
@@ -296,15 +297,15 @@ void export_journal()
 	     with_custodian_and_ward_postcall<0, 1> >())
 #endif
 
-    .def("__iter__", range<return_internal_reference<> >
+    .def("__iter__", python::range<return_internal_reference<> >
 	 (&journal_t::xacts_begin, &journal_t::xacts_end))
-    .def("xacts", range<return_internal_reference<> >
+    .def("xacts", python::range<return_internal_reference<> >
 	 (&journal_t::xacts_begin, &journal_t::xacts_end))
-    .def("auto_xacts", range<return_internal_reference<> >
+    .def("auto_xacts", python::range<return_internal_reference<> >
 	 (&journal_t::auto_xacts_begin, &journal_t::auto_xacts_end))
-    .def("period_xacts", range<return_internal_reference<> >
+    .def("period_xacts", python::range<return_internal_reference<> >
 	 (&journal_t::period_xacts_begin, &journal_t::period_xacts_end))
-    .def("sources", range<return_internal_reference<> >
+    .def("sources", python::range<return_internal_reference<> >
 	 (&journal_t::sources_begin, &journal_t::sources_end))
 
     .def("read", py_read)
diff --git a/src/py_xact.cc b/src/py_xact.cc
index c4e1fd32..6553a67f 100644
--- a/src/py_xact.cc
+++ b/src/py_xact.cc
@@ -98,9 +98,9 @@ void export_xact()
 
     .def("finalize", &xact_base_t::finalize)
 
-    .def("__iter__", range<return_internal_reference<> >
+    .def("__iter__", python::range<return_internal_reference<> >
 	 (&xact_t::posts_begin, &xact_t::posts_end))
-    .def("posts", range<return_internal_reference<> >
+    .def("posts", python::range<return_internal_reference<> >
 	 (&xact_t::posts_begin, &xact_t::posts_end))
 
     .def("valid", &xact_base_t::valid)