|
Alec Leamas |
e21f3a8 |
diff --git a/adobe/move.hpp b/adobe/move.hpp
|
|
Alec Leamas |
1182e78 |
index 350000d..6c302a2 100644
|
|
Alec Leamas |
e21f3a8 |
--- a/adobe/move.hpp
|
|
Alec Leamas |
e21f3a8 |
+++ b/adobe/move.hpp
|
|
Alec Leamas |
1182e78 |
@@ -440,8 +440,8 @@ with move semantics, for movable types, otherwise with copy semantics.
|
|
Alec Leamas |
1182e78 |
*/
|
|
Alec Leamas |
e21f3a8 |
template
|
|
Alec Leamas |
e21f3a8 |
typename O> // O models BidirectionalIterator
|
|
Alec Leamas |
1182e78 |
-inline O move_backward(I& in, O out)
|
|
Alec Leamas |
e21f3a8 |
-{ return move_backward(boost::begin(in), boost::end(in), out); }
|
|
Alec Leamas |
1182e78 |
+inline O adobe::move_backward(I& in, O 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 |
55ea41a |
diff --git a/adobe/once.hpp b/adobe/once.hpp
|
|
Alec Leamas |
55ea41a |
index 5f005a4..e349b92 100644
|
|
Alec Leamas |
55ea41a |
--- a/adobe/once.hpp
|
|
Alec Leamas |
55ea41a |
+++ 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 |
c62675d |
diff --git a/adobe/vector.hpp b/adobe/vector.hpp
|
|
Alec Leamas |
f333bfd |
index 2d23e59..8968b59 100644
|
|
Alec Leamas |
c62675d |
--- a/adobe/vector.hpp
|
|
Alec Leamas |
c62675d |
+++ 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 |
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 |
}
|