Blame asl-boost-1.50.patch

Alec Leamas 58bf1a8
diff --git a/adobe/move.hpp b/adobe/move.hpp
Alec Leamas 5ed0b82
index 350000d..5fe6db5 100644
Alec Leamas 58bf1a8
--- a/adobe/move.hpp
Alec Leamas 58bf1a8
+++ b/adobe/move.hpp
Alec Leamas 5ed0b82
@@ -441,7 +441,7 @@ with move semantics, for movable types, otherwise with copy semantics.
Alec Leamas e21f3a8
 template 
Alec Leamas e21f3a8
           typename O> // O models BidirectionalIterator
Alec Leamas 5ed0b82
 inline O move_backward(I& in, O out)
Alec Leamas e21f3a8
-{ return move_backward(boost::begin(in), boost::end(in), out); }
Alec Leamas e21f3a8
+{ return adobe::move_backward(boost::begin(in), boost::end(in), out); }
Alec Leamas e21f3a8
 
Alec Leamas e21f3a8
 /*************************************************************************************************/
Alec Leamas e21f3a8
 
Alec Leamas 58bf1a8
diff --git a/adobe/once.hpp b/adobe/once.hpp
Alec Leamas 55ea41a
index 5f005a4..e349b92 100644
Alec Leamas 58bf1a8
--- a/adobe/once.hpp
Alec Leamas 58bf1a8
+++ b/adobe/once.hpp
Alec Leamas 55ea41a
@@ -11,12 +11,12 @@
Alec Leamas 55ea41a
 
Alec Leamas 55ea41a
 /*************************************************************************************************/
Alec Leamas 55ea41a
 
Alec Leamas 55ea41a
-#include <adobe/config.hpp>
Alec Leamas 55ea41a
-
Alec Leamas 55ea41a
 #if defined(BOOST_HAS_THREADS)
Alec Leamas 55ea41a
     #include <boost/thread.hpp>
Alec Leamas 55ea41a
 #endif
Alec Leamas 55ea41a
 
Alec Leamas 55ea41a
+#include <adobe/config.hpp>
Alec Leamas 55ea41a
+
Alec Leamas 55ea41a
 /*************************************************************************************************/
Alec Leamas 55ea41a
 
Alec Leamas 55ea41a
 namespace adobe {
Alec Leamas 58bf1a8
diff --git a/adobe/vector.hpp b/adobe/vector.hpp
Alec Leamas 5ed0b82
index 926cfa9..8968b59 100644
Alec Leamas 58bf1a8
--- a/adobe/vector.hpp
Alec Leamas 58bf1a8
+++ b/adobe/vector.hpp
Alec Leamas f333bfd
@@ -319,7 +319,7 @@ void vector<T, A>::append_move(I f, I l, std::forward_iterator_tag)
Alec Leamas f333bfd
     size_type n(std::distance(f, l));
Alec Leamas f333bfd
     
Alec Leamas f333bfd
 	if (remaining() < n) reserve((adobe::max)(size() + n, 2 * size()));
Alec Leamas f333bfd
-    set_finish(uninitialized_move(f, l, end()));
Alec Leamas f333bfd
+    set_finish(adobe::uninitialized_move(f, l, end()));
Alec Leamas f333bfd
 }
Alec Leamas f333bfd
     
Alec Leamas f333bfd
 template <typename T, typename A>
Alec Leamas 5ed0b82
@@ -354,7 +354,7 @@ typename vector<T, A>::iterator vector<T, A>::insert(iterator p, I f, I l, std::
Alec Leamas 5ed0b82
         
Alec Leamas 5ed0b82
         if (n < after) {
Alec Leamas 5ed0b82
             append_move(last - n, last);
Alec Leamas 5ed0b82
-            move_backward(p, last - n, last);
Alec Leamas 5ed0b82
+            adobe::move_backward(p, last - n, last);
Alec Leamas 5ed0b82
             std::copy(f, l, p);
Alec Leamas 5ed0b82
         } else {
Alec Leamas 5ed0b82
             I m = f;
Alec Leamas 5ed0b82
@@ -387,7 +387,7 @@ typename vector<T, A>::iterator vector<T, A>::insert_move(iterator p, I f, I l)
Alec Leamas 5ed0b82
         
Alec Leamas 5ed0b82
         if (n < after) {
Alec Leamas 5ed0b82
             append_move(last - n, last);
Alec Leamas 5ed0b82
-            move_backward(p, last - n, last);
Alec Leamas 5ed0b82
+            adobe::move_backward(p, last - n, last);
Alec Leamas 5ed0b82
             adobe::move(f, l, p);
Alec Leamas 5ed0b82
         } else {
Alec Leamas 5ed0b82
             I m = f;
Alec Leamas f333bfd
@@ -406,7 +406,7 @@ void vector<T, A>::reserve(size_type n)
Alec Leamas f333bfd
     if (capacity() < n) {
Alec Leamas f333bfd
         vector tmp;
Alec Leamas f333bfd
         tmp.header_m = allocate(get_allocator(), n);
Alec Leamas f333bfd
-        tmp.header_m->finish() = uninitialized_move(begin(), end(), tmp.end());
Alec Leamas f333bfd
+        tmp.header_m->finish() = adobe::uninitialized_move(begin(), end(), tmp.end());
Alec Leamas f333bfd
         swap(tmp);
Alec Leamas f333bfd
     }
Alec Leamas f333bfd
 }
Alec Leamas 5ed0b82
@@ -430,7 +430,7 @@ typename vector<T, A>::iterator vector<T, A>::insert(iterator p, size_type n, co
Alec Leamas 5ed0b82
         
Alec Leamas 5ed0b82
         if (n < after) {
Alec Leamas 5ed0b82
             append_move(last - n, last);
Alec Leamas 5ed0b82
-            move_backward(p, last - n, last);
Alec Leamas 5ed0b82
+            adobe::move_backward(p, last - n, last);
Alec Leamas 5ed0b82
             std::fill_n(p, n, x);
Alec Leamas 5ed0b82
         } else {
Alec Leamas 5ed0b82
             std::uninitialized_fill_n(last, n - after, x);