From b5fe6de577ecaa5f3d50dcabd95d4503bc127fe2 Mon Sep 17 00:00:00 2001
From: Jan Gaspar <jano_gaspar@yahoo.com>
Date: Sun, 2 Oct 2005 22:18:03 +0000
Subject: [PATCH] small merge

[SVN r2725]
---
 include/boost/circular_buffer/base.hpp            | 2 +-
 include/boost/circular_buffer/space_optimized.hpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/boost/circular_buffer/base.hpp b/include/boost/circular_buffer/base.hpp
index 931f834..b74053f 100644
--- a/include/boost/circular_buffer/base.hpp
+++ b/include/boost/circular_buffer/base.hpp
@@ -1282,7 +1282,7 @@ private:
     //! Specialized assign method.
     template <class IntegralType>
     void assign(size_type capacity, IntegralType n, IntegralType item, cb_details::int_tag) {
-        // TODO assign(capacity, static_cast<size_type>(n), item);
+        assign(capacity, static_cast<size_type>(n), item);
     }
 
     //! Specialized assign method.
diff --git a/include/boost/circular_buffer/space_optimized.hpp b/include/boost/circular_buffer/space_optimized.hpp
index 5f84f78..9dffbc9 100644
--- a/include/boost/circular_buffer/space_optimized.hpp
+++ b/include/boost/circular_buffer/space_optimized.hpp
@@ -264,7 +264,9 @@ public:
         const allocator_type& alloc = allocator_type())
     : circular_buffer<T, Alloc>(
         init_capacity(capacity_ctrl, first, last), first, last, alloc) // TODO
-    , m_capacity_ctrl(capacity_ctrl) {}
+    , m_capacity_ctrl(capacity_ctrl) {
+    
+    }
 
     // Default destructor