[Boost-commit] svn:boost r43496 - trunk/boost/accumulators/numeric

From: eric_at_[hidden]
Date: 2008-03-04 13:51:07

Author: eric_niebler
Date: 2008-03-04 13:51:07 EST (Tue, 04 Mar 2008)
New Revision: 43496
URL: http://svn.boost.org/trac/boost/changeset/43496

Log:
rename numeric::empty to numeric::default_, fixes #1650
Text files modified: 
   trunk/boost/accumulators/numeric/functional.hpp     |    16 ++++++++--------                        
   trunk/boost/accumulators/numeric/functional_fwd.hpp |     6 +++---                                  
   2 files changed, 11 insertions(+), 11 deletions(-)

Modified: trunk/boost/accumulators/numeric/functional.hpp
==============================================================================
--- trunk/boost/accumulators/numeric/functional.hpp	(original)
+++ trunk/boost/accumulators/numeric/functional.hpp	2008-03-04 13:51:07 EST (Tue, 04 Mar 2008)
@@ -428,20 +428,20 @@
     }
 
     template<typename T>
-    struct empty
+    struct default_
     {
-        typedef empty type;
+        typedef default_ type;
         typedef T value_type;
         static T const value;
 
         operator T const & () const
         {
-            return empty::value;
+            return default_::value;
         }
     };
 
     template<typename T>
-    T const empty<T>::value = T();
+    T const default_<T>::value = T();
 
     template<typename T>
     struct one
@@ -476,13 +476,13 @@
     T const zero<T>::value = T();
 
     template<typename T>
-    struct one_or_empty
-      : mpl::if_<is_empty<T>, empty<T>, one<T> >::type
+    struct one_or_default
+      : mpl::if_<is_empty<T>, default_<T>, one<T> >::type
     {};
 
     template<typename T>
-    struct zero_or_empty
-      : mpl::if_<is_empty<T>, empty<T>, zero<T> >::type
+    struct zero_or_default
+      : mpl::if_<is_empty<T>, default_<T>, zero<T> >::type
     {};
 
 }} // namespace boost::numeric

Modified: trunk/boost/accumulators/numeric/functional_fwd.hpp
==============================================================================
--- trunk/boost/accumulators/numeric/functional_fwd.hpp	(original)
+++ trunk/boost/accumulators/numeric/functional_fwd.hpp	2008-03-04 13:51:07 EST (Tue, 04 Mar 2008)
@@ -202,7 +202,7 @@
     promote(From const &from);
 
     template<typename T>
-    struct empty;
+    struct default_;
 
     template<typename T>
     struct one;
@@ -211,10 +211,10 @@
     struct zero;
 
     template<typename T>
-    struct one_or_empty;
+    struct one_or_default;
 
     template<typename T>
-    struct zero_or_empty;
+    struct zero_or_default;
 
 }} // namespace boost::numeric