Boost logo

Boost-Commit :

From: peder.holt_at_[hidden]
Date: 2007-10-29 04:05:18


Author: burbelgruff
Date: 2007-10-29 04:05:17 EDT (Mon, 29 Oct 2007)
New Revision: 40540
URL: http://svn.boost.org/trac/boost/changeset/40540

Log:
Fixed duplicate definition of boost::type_of::push_back when BOOST_TYPEOF_LIMIT_SIZE>50 and not a multiple of 50. (From Dave Jenkins)
Text files modified:
   trunk/boost/typeof/vector.hpp | 5 ++++-
   1 files changed, 4 insertions(+), 1 deletions(-)

Modified: trunk/boost/typeof/vector.hpp
==============================================================================
--- trunk/boost/typeof/vector.hpp (original)
+++ trunk/boost/typeof/vector.hpp 2007-10-29 04:05:17 EDT (Mon, 29 Oct 2007)
@@ -138,9 +138,12 @@
 
 namespace boost { namespace type_of {
 
+# if BOOST_TYPEOF_LIMIT_SIZE < 50
     template<class V, class T> struct push_back {
         typedef V type;
- }; //default behaviour is to let push_back ignore T, and return the input vector.
+ };
+# endif
+ //default behaviour is to let push_back ignore T, and return the input vector.
     //This is to let BOOST_TYPEOF_NESTED_TYPEDEF work properly with the default vector.
 # define BOOST_PP_LOCAL_MACRO BOOST_TYPEOF_spec_push_back
 # define BOOST_PP_LOCAL_LIMITS \


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk