Subject: [Boost-commit] svn:boost r85433 - trunk/boost/gil
From: chhenning_at_[hidden]
Date: 2013-08-22 20:46:15
Author: chhenning
Date: 2013-08-22 20:46:15 EDT (Thu, 22 Aug 2013)
New Revision: 85433
URL: http://svn.boost.org/trac/boost/changeset/85433
Log:
Replacing boost::conditional with boost::bool_.
Text files modified:
trunk/boost/gil/image.hpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
Modified: trunk/boost/gil/image.hpp
==============================================================================
--- trunk/boost/gil/image.hpp Thu Aug 22 18:11:48 2013 (r85432)
+++ trunk/boost/gil/image.hpp 2013-08-22 20:46:15 EDT (Thu, 22 Aug 2013) (r85433)
@@ -24,9 +24,10 @@
#include <cstddef>
#include <memory>
+#include <boost/mpl/bool.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/arithmetic.hpp>
-#include <boost/type_traits/conditional.hpp>
+
#include "gil_config.hpp"
#include "image_view.hpp"
@@ -173,7 +174,7 @@
destruct_pixels( _view );
create_view( dims
- , typename boost::conditional< IsPlanar, mpl::true_, mpl::false_ >::type()
+ , typename mpl::bool_<IsPlanar>()
);
default_construct_pixels( _view );
@@ -205,7 +206,7 @@
destruct_pixels( _view );
create_view( dims
- , typename boost::conditional< IsPlanar, mpl::true_, mpl::false_ >::type()
+ , typename mpl::bool_<IsPlanar>()
);
uninitialized_fill_pixels(_view, p_in);
@@ -241,7 +242,7 @@
destruct_pixels( _view );
create_view( dims
- , typename boost::conditional< IsPlanar, mpl::true_, mpl::false_ >::type()
+ , typename mpl::bool_<IsPlanar>()
);
default_construct_pixels( _view );
@@ -275,7 +276,7 @@
destruct_pixels( _view );
create_view( dims
- , typename boost::conditional< IsPlanar, mpl::true_, mpl::false_ >::type()
+ , typename mpl::bool_<IsPlanar>()
);
uninitialized_fill_pixels(_view, p_in);
@@ -360,7 +361,7 @@
std::size_t size_in_units = is_planar_impl( get_row_size_in_memunits( dimensions.x ) * dimensions.y
, _channels_in_image
- , typename boost::conditional< IsPlanar, mpl::true_, mpl::false_ >::type()
+ , typename mpl::bool_<IsPlanar>()
);
// return the size rounded up to the nearest byte