[Boost-commit] svn:boost r54773 - in sandbox/itl: boost/itl boost/itl/detail libs/itl/example/partys_tallest_guests_

Subject: [Boost-commit] svn:boost r54773 - in sandbox/itl: boost/itl boost/itl/detail libs/itl/example/partys_tallest_guests_
From: afojgo_at_[hidden]
Date: 2009-07-07 12:56:44

Author: jofaber
Date: 2009-07-07 12:56:43 EDT (Tue, 07 Jul 2009)
New Revision: 54773
URL: http://svn.boost.org/trac/boost/changeset/54773

Log:
Switched to template template parameters for aggregator functors again. Some minor corrections. 
Text files modified: 
   sandbox/itl/boost/itl/detail/design_config.hpp                                |     8 ++++----                                
   sandbox/itl/boost/itl/map.hpp                                                 |     4 ++--                                    
   sandbox/itl/boost/itl/set.hpp                                                 |     8 ++++----                                
   sandbox/itl/libs/itl/example/partys_tallest_guests_/partys_tallest_guests.cpp |     6 +++---                                  
   4 files changed, 13 insertions(+), 13 deletions(-)

Modified: sandbox/itl/boost/itl/detail/design_config.hpp
==============================================================================
--- sandbox/itl/boost/itl/detail/design_config.hpp	(original)
+++ sandbox/itl/boost/itl/detail/design_config.hpp	2009-07-07 12:56:43 EDT (Tue, 07 Jul 2009)
@@ -26,12 +26,12 @@
 //     template type parameter variants.
 
 #define ITL_USE_COMPARE_TEMPLATE_TEMPLATE
-//#define ITL_USE_COMBINE_TEMPLATE_TEMPLATE
-//#define ITL_USE_SECTION_TEMPLATE_TEMPLATE
+#define ITL_USE_COMBINE_TEMPLATE_TEMPLATE
+#define ITL_USE_SECTION_TEMPLATE_TEMPLATE
 
 //#define ITL_USE_COMPARE_TEMPLATE_TYPE
-#define ITL_USE_COMBINE_TEMPLATE_TYPE
-#define ITL_USE_SECTION_TEMPLATE_TYPE
+//#define ITL_USE_COMBINE_TEMPLATE_TYPE
+//#define ITL_USE_SECTION_TEMPLATE_TYPE
 
 //------------------------------------------------------------------------------
 // template parameter Compare can not be a template type parameter as long as

Modified: sandbox/itl/boost/itl/map.hpp
==============================================================================
--- sandbox/itl/boost/itl/map.hpp	(original)
+++ sandbox/itl/boost/itl/map.hpp	2009-07-07 12:56:43 EDT (Tue, 07 Jul 2009)
@@ -877,12 +877,12 @@
 struct is_interval_container<itl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >
 { 
     typedef is_interval_container<itl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> > type;
-    enum{value = true}; 
+    static const bool value = false; 
 };
 
 template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
 struct is_interval_splitter<itl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >
-{ enum{value = false}; };
+{ static const bool value = false; };
 
 template <class DomainT, class CodomainT, class Traits, ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, ITL_ALLOC Alloc>
 struct absorbs_neutrons<itl::map<DomainT,CodomainT,Traits,Compare,Combine,Section,Alloc> >

Modified: sandbox/itl/boost/itl/set.hpp
==============================================================================
--- sandbox/itl/boost/itl/set.hpp	(original)
+++ sandbox/itl/boost/itl/set.hpp	2009-07-07 12:56:43 EDT (Tue, 07 Jul 2009)
@@ -625,20 +625,20 @@
 struct is_interval_container<itl::set<Type> >
 { 
     typedef is_interval_container<itl::set<Type> > type;
-    enum{value = true}; 
+    static const bool value = false; 
 };
 
 template <class Type>
 struct is_interval_splitter<itl::set<Type> >
-{ enum{value = false}; };
+{ static const bool value = false; };
 
 template <class Type>
 struct absorbs_neutrons<itl::set<Type> >
-{ enum{value = false}; };
+{ static const bool value = false; };
 
 template <class Type>
 struct is_total<itl::set<Type> >
-{ enum{value = false}; };
+{ static const bool value = false; };
 
 template <class Type>
 struct type_to_string<itl::set<Type> >

Modified: sandbox/itl/libs/itl/example/partys_tallest_guests_/partys_tallest_guests.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/partys_tallest_guests_/partys_tallest_guests.cpp	(original)
+++ sandbox/itl/libs/itl/example/partys_tallest_guests_/partys_tallest_guests.cpp	2009-07-07 12:56:43 EDT (Tue, 07 Jul 2009)
@@ -41,13 +41,13 @@
 
 
 // A party's height shall be defined as the maximum height of all guests ;-)
-// The last parameter 'inplace_max<int>' is a functor template that calls a max 
+// The last parameter 'inplace_max' is a functor template that calls a max 
 // aggregation on overlap.
-typedef interval_map<ptime, int, partial_absorber, less, inplace_max<int> > 
+typedef interval_map<ptime, int, partial_absorber, less, inplace_max> 
     PartyHeightHistoryT;
 
 // Using a split_interval_map we preserve interval splittings that occured via insertion.
-typedef split_interval_map<ptime, int, partial_absorber, less, inplace_max<int> > 
+typedef split_interval_map<ptime, int, partial_absorber, less, inplace_max> 
     PartyHeightSplitHistoryT;
 
 void partys_height()