[Boost-commit] svn:boost r54006 - in sandbox/monotonic: boost/monotonic libs/monotonic/test

Subject: [Boost-commit] svn:boost r54006 - in sandbox/monotonic: boost/monotonic libs/monotonic/test
From: christian.schladetsch_at_[hidden]
Date: 2009-06-17 05:15:44

Author: cschladetsch
Date: 2009-06-17 05:15:43 EDT (Wed, 17 Jun 2009)
New Revision: 54006
URL: http://svn.boost.org/trac/boost/changeset/54006

Log:
temp. fixes for GCC
Text files modified: 
   sandbox/monotonic/boost/monotonic/allocator.hpp  |     2 +-                                      
   sandbox/monotonic/boost/monotonic/container.hpp  |     6 ++++--                                  
   sandbox/monotonic/boost/monotonic/exceptions.hpp |     5 +++--                                   
   sandbox/monotonic/boost/monotonic/map.hpp        |     4 ++--                                    
   sandbox/monotonic/libs/monotonic/test/main.cpp   |     4 ++--                                    
   5 files changed, 12 insertions(+), 9 deletions(-)

Modified: sandbox/monotonic/boost/monotonic/allocator.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/allocator.hpp	(original)
+++ sandbox/monotonic/boost/monotonic/allocator.hpp	2009-06-17 05:15:43 EDT (Wed, 17 Jun 2009)
@@ -109,7 +109,7 @@
 
                         void construct(pointer ptr)
                         {
-				construct(ptr, detail::IsMonotonic<T>);
+				construct(ptr, detail::IsMonotonic<T>());
                         }
 
                         void construct(pointer ptr, const boost::false_type &)

Modified: sandbox/monotonic/boost/monotonic/container.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/container.hpp	(original)
+++ sandbox/monotonic/boost/monotonic/container.hpp	2009-06-17 05:15:43 EDT (Wed, 17 Jun 2009)
@@ -35,12 +35,14 @@
                         {
                                 typedef Impl Derived;
 
+				virtual ~MonotonicContainer() { }
                                 storage_base &GetStorage() const
                                 {
-					Derived const &self = static_cast<Derived const &>(*this);
+					Derived const &self = dynamic_cast<Derived const &>(*this);
                                         storage_base *store = self.get_allocator().get_storage();
                                         if (store == 0)
-						throw_exception(no_storage());
+						//throw_exception(no_storage());
+						throw no_storage();
                                         return *store;
                                 }
                         };

Modified: sandbox/monotonic/boost/monotonic/exceptions.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/exceptions.hpp	(original)
+++ sandbox/monotonic/boost/monotonic/exceptions.hpp	2009-06-17 05:15:43 EDT (Wed, 17 Jun 2009)
@@ -7,7 +7,8 @@
 #define BOOST_MONOTONIC_EXCEPTIONS_HPP
 
 #include <boost/monotonic/config.hpp>
-#include <boost/exception.hpp>
+//#include <boost/exception.hpp>
+#include <stdexcept>
 
 namespace boost
 {
@@ -17,7 +18,7 @@
                 struct no_storage : std::exception
                 {
                         no_storage() { }
-			no_storage(const char *text) : std::exception(text) { }
+			//no_storage(const char *text) : std::exception(text) { }
                 };
         
         } // namespace monotonic

Modified: sandbox/monotonic/boost/monotonic/map.hpp
==============================================================================
--- sandbox/monotonic/boost/monotonic/map.hpp	(original)
+++ sandbox/monotonic/boost/monotonic/map.hpp	2009-06-17 05:15:43 EDT (Wed, 17 Jun 2009)
@@ -18,7 +18,7 @@
                 template <class K, class T, class P = std::less<K> >
                 struct map : detail::MonotonicContainer<map<K,T,P> >
                 {
-			typedef detail::MonotonicContainer<std::map<K,T,P, allocator<K> > > Parent;
+			typedef detail::MonotonicContainer<map<K,T,P> > Parent;
                         typedef detail::Creator<detail::IsMonotonic<T>::value, T> Creator;
 
                         typedef P Predicate;
@@ -103,7 +103,7 @@
                                 iterator where = impl.lower_bound(key);
                                 if (where == impl.end() || pred(key, where->first))
                                 {
-					where = impl.insert(where, value_type(key, Creator::Create(GetStorage())));
+					where = impl.insert(where, value_type(key, Creator::Create(this->Parent::GetStorage())));
                                 }
                                 return where->second;
                         }

Modified: sandbox/monotonic/libs/monotonic/test/main.cpp
==============================================================================
--- sandbox/monotonic/libs/monotonic/test/main.cpp	(original)
+++ sandbox/monotonic/libs/monotonic/test/main.cpp	2009-06-17 05:15:43 EDT (Wed, 17 Jun 2009)
@@ -370,8 +370,8 @@
         _set_se_translator(straight_to_debugger);
 #endif
 
-	test_mono_map();
-	//test_map_list_heap_stack();
+	//test_mono_map();
+	test_map_list_heap_stack();
         //test_static_storage();
         //run_all_tests();
 }