Update of /cvsroot/boost/boost/boost/fusion/sequence/container/vector
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21096/boost/fusion/sequence/container/vector
Modified Files:
vector.hpp
Log Message:
Tweaks for VC7.1
Index: vector.hpp
===================================================================
RCS file:
/cvsroot/boost/boost/boost/fusion/sequence/container/vector/vector.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vector.hpp 16 Aug 2006 16:50:42 -0000 1.1
+++ vector.hpp 10 Sep 2006 05:56:10 -0000 1.2
@@ -16,6 +16,8 @@
#include <boost/mpl/bool.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/utility/enable_if.hpp>
namespace boost { namespace fusion
{
@@ -52,7 +54,16 @@
: vec(rhs.vec) {}
template <typename T>
- explicit vector(T const& rhs)
+ explicit vector(
+ T const& rhs
+#if defined(BOOST_MSVC)
+// VC++ gets confused when RHS is a derived type. It fails to call
+// the copy ctor and attempts to call this templated constructor instead.
+ , typename disable_if<
+ is_convertible<T, vector> // use copy ctor instead
+ >::type* dummy = 0
+#endif
+ )
: vec(rhs) {}
// Expand a couple of forwarding constructors for arguments
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
