From: aaron.windsor_at_[hidden]
Date: 2007-09-22 13:41:20
Author: aaron_windsor
Date: 2007-09-22 13:41:18 EDT (Sat, 22 Sep 2007)
New Revision: 39480
URL: http://svn.boost.org/trac/boost/changeset/39480
Log:
Some fixes for errors and warnings on HP cxx.
Text files modified:
trunk/boost/graph/boyer_myrvold_planar_test.hpp | 71 +++++++++++++++++++++------------------
trunk/boost/graph/planar_detail/bucket_sort.hpp | 2
2 files changed, 39 insertions(+), 34 deletions(-)
Modified: trunk/boost/graph/boyer_myrvold_planar_test.hpp
==============================================================================
--- trunk/boost/graph/boyer_myrvold_planar_test.hpp (original)
+++ trunk/boost/graph/boyer_myrvold_planar_test.hpp 2007-09-22 13:41:18 EDT (Sat, 22 Sep 2007)
@@ -24,11 +24,11 @@
namespace boyer_myrvold_params
{
- BOOST_PARAMETER_KEYWORD(tag, graph);
- BOOST_PARAMETER_KEYWORD(tag, embedding);
- BOOST_PARAMETER_KEYWORD(tag, kuratowski_subgraph);
- BOOST_PARAMETER_KEYWORD(tag, vertex_index_map);
- BOOST_PARAMETER_KEYWORD(tag, edge_index_map);
+ BOOST_PARAMETER_KEYWORD(tag, graph)
+ BOOST_PARAMETER_KEYWORD(tag, embedding)
+ BOOST_PARAMETER_KEYWORD(tag, kuratowski_subgraph)
+ BOOST_PARAMETER_KEYWORD(tag, vertex_index_map)
+ BOOST_PARAMETER_KEYWORD(tag, edge_index_map)
typedef parameter::parameters< parameter::required<tag::graph>,
tag::embedding,
@@ -39,34 +39,6 @@
namespace core
{
- template <typename ArgumentPack>
- bool boyer_myrvold_planarity_test(ArgumentPack const& args)
- {
-
- typedef typename parameter::binding
- < ArgumentPack,
- tag::kuratowski_subgraph,
- const no_kuratowski_subgraph_isolation&
- >::type
- kuratowski_arg_t;
-
- typedef typename parameter::binding
- < ArgumentPack,
- tag::embedding,
- const no_planar_embedding&
- >::type
- embedding_arg_t;
-
- return dispatched_boyer_myrvold
- (args,
- boost::is_same
- <embedding_arg_t, const no_planar_embedding&>(),
- boost::is_same
- <kuratowski_arg_t, const no_kuratowski_subgraph_isolation&>()
- );
- }
-
-
template <typename ArgumentPack>
bool dispatched_boyer_myrvold(ArgumentPack const& args,
@@ -256,6 +228,39 @@
return false;
}
}
+
+
+
+
+ template <typename ArgumentPack>
+ bool boyer_myrvold_planarity_test(ArgumentPack const& args)
+ {
+
+ typedef typename parameter::binding
+ < ArgumentPack,
+ tag::kuratowski_subgraph,
+ const no_kuratowski_subgraph_isolation&
+ >::type
+ kuratowski_arg_t;
+
+ typedef typename parameter::binding
+ < ArgumentPack,
+ tag::embedding,
+ const no_planar_embedding&
+ >::type
+ embedding_arg_t;
+
+ return dispatched_boyer_myrvold
+ (args,
+ boost::is_same
+ <embedding_arg_t, const no_planar_embedding&>(),
+ boost::is_same
+ <kuratowski_arg_t, const no_kuratowski_subgraph_isolation&>()
+ );
+ }
+
+
+
} //namespace core
} //namespace boyer_myrvold_params
Modified: trunk/boost/graph/planar_detail/bucket_sort.hpp
==============================================================================
--- trunk/boost/graph/planar_detail/bucket_sort.hpp (original)
+++ trunk/boost/graph/planar_detail/bucket_sort.hpp 2007-09-22 13:41:18 EDT (Sat, 22 Sep 2007)
@@ -60,7 +60,7 @@
return get(m_wrapper_map, get<n>(x));
}
- const static int n = N;
+ static const int n = N;
PropertyMapWrapper m_wrapper_map;
};