boost-sandbox-cvs

[Jan G. <jan...@us...>]

Update of /cvsroot/boost-sandbox/boost-sandbox/boost/circular_buffer
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9802/boost/circular_buffer

Modified Files:
	base.hpp details.hpp 
Log Message:
Fixed compilation issues.

Index: base.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/circular_buffer/base.hpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- base.hpp	18 Feb 2007 23:03:26 -0000	1.79
+++ base.hpp	19 Feb 2007 23:18:10 -0000	1.80
@@ -2109,7 +2109,12 @@
             clear();
             insert(begin(), first, last);
         } else {
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
+            circular_buffer<value_type, allocator_type> tmp(new_capacity, m_alloc);
+            tmp.insert(begin(), first, last);
+#else
             circular_buffer<value_type, allocator_type> tmp(new_capacity, first, last, m_alloc);
+#endif // #if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
             tmp.swap(*this);
         }
     }

Index: details.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/circular_buffer/details.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- details.hpp	18 Feb 2007 23:03:26 -0000	1.21
+++ details.hpp	19 Feb 2007 23:18:10 -0000	1.22
@@ -78,7 +78,6 @@
     explicit iterator_wrapper(Iterator it) : m_it(it) {}
     Iterator operator () () const { return m_it++; }
 private:
-	iterator_wrapper(const iterator_wrapper<Iterator>&); // do not generate
     iterator_wrapper<Iterator>& operator = (const iterator_wrapper<Iterator>&); // do not generate
 };
 
@@ -92,7 +91,6 @@
     explicit item_wrapper(Value item) : m_item(item) {}
     Pointer operator () () const { return &m_item; }
 private:
-    item_wrapper(const item_wrapper<Pointer, Value>&); // do not generate
     item_wrapper<Pointer, Value>& operator = (const item_wrapper<Pointer, Value>&); // do not generate
 };
 
@@ -106,13 +104,12 @@
     size_type m_n;
     Value m_item;
     Alloc& m_alloc;
-    explicit assign_n(size_type n, Value item, Alloc& alloc) : m_n(n), m_item(item), m_alloc(alloc) {}
+    assign_n(size_type n, Value item, Alloc& alloc) : m_n(n), m_item(item), m_alloc(alloc) {}
     template <class Pointer>
     void operator () (Pointer p) const {
         uninitialized_fill_n(p, m_n, m_item, m_alloc);
     }
 private:
-    assign_n(const assign_n<Value, Alloc>&); // do not generate
     assign_n<Value, Alloc>& operator = (const assign_n<Value, Alloc>&); // do not generate
 };
 
@@ -125,13 +122,12 @@
     const Iterator& m_first;
     const Iterator& m_last;
     Alloc& m_alloc;
-    explicit assign_range(const Iterator& first, const Iterator& last, Alloc& alloc) : m_first(first), m_last(last), m_alloc(alloc) {}
+    assign_range(const Iterator& first, const Iterator& last, Alloc& alloc) : m_first(first), m_last(last), m_alloc(alloc) {}
     template <class Pointer>
     void operator () (Pointer p) const {
         uninitialized_copy(m_first, m_last, p, m_alloc);
     }
 private:
-    assign_range(const assign_range<Iterator, Alloc>&); // do not generate
     assign_range<Iterator, Alloc>& operator = (const assign_range<Iterator, Alloc>&); // do not generate
 };