Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r66618 - in trunk: boost/msm/mpl_graph boost/msm/mpl_graph/detail libs/msm/example/mpl_graph
From: gordon_at_[hidden]
Date: 2010-11-16 21:07:54

Author: gordon.woodhull
Date: 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
New Revision: 66618
URL: http://svn.boost.org/trac/boost/changeset/66618

Log:
correct namespaces for mpl_graph as child of msm
Text files modified:
   trunk/boost/msm/mpl_graph/adjacency_list_graph.hpp | 8 ++++----
   trunk/boost/msm/mpl_graph/breadth_first_search.hpp | 10 +++++-----
   trunk/boost/msm/mpl_graph/depth_first_search.hpp | 10 +++++-----
   trunk/boost/msm/mpl_graph/detail/adjacency_list_graph.ipp | 8 ++++----
   trunk/boost/msm/mpl_graph/detail/graph_implementation_interface.ipp | 8 ++++----
   trunk/boost/msm/mpl_graph/detail/incidence_list_graph.ipp | 8 ++++----
   trunk/boost/msm/mpl_graph/incidence_list_graph.hpp | 8 ++++----
   trunk/boost/msm/mpl_graph/mpl_graph.hpp | 10 +++++-----
   trunk/boost/msm/mpl_graph/mpl_utils.hpp | 8 ++++----
   trunk/boost/msm/mpl_graph/search_colors.hpp | 10 +++++-----
   trunk/libs/msm/example/mpl_graph/adjacency_list_graph.cpp | 2 +-
   trunk/libs/msm/example/mpl_graph/breadth_first_search.cpp | 2 +-
   trunk/libs/msm/example/mpl_graph/depth_first_search.cpp | 2 +-
   trunk/libs/msm/example/mpl_graph/incidence_list_graph.cpp | 2 +-
   trunk/libs/msm/example/mpl_graph/msm_adaptor.cpp | 2 +-
   15 files changed, 49 insertions(+), 49 deletions(-)

Modified: trunk/boost/msm/mpl_graph/adjacency_list_graph.hpp
==============================================================================
--- trunk/boost/msm/mpl_graph/adjacency_list_graph.hpp (original)
+++ trunk/boost/msm/mpl_graph/adjacency_list_graph.hpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,8 +2,8 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_ADJACENCY_LIST_GRAPH_HPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_ADJACENCY_LIST_GRAPH_HPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_ADJACENCY_LIST_GRAPH_HPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_ADJACENCY_LIST_GRAPH_HPP_INCLUDED

// graph implementation based on an adjacency list
// sequence< pair< source_vertex, sequence< pair<edge, target_vertex> > > >
@@ -19,7 +19,7 @@
#include <boost/msm/mpl_graph/detail/adjacency_list_graph.ipp>

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {

template<typename AdjacencyList>
@@ -32,4 +32,4 @@
}
}

-#endif // BOOST_METAGRAPH_MPL_GRAPH_ADJACENCY_LIST_GRAPH_HPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_ADJACENCY_LIST_GRAPH_HPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/breadth_first_search.hpp
==============================================================================
--- trunk/boost/msm/mpl_graph/breadth_first_search.hpp (original)
+++ trunk/boost/msm/mpl_graph/breadth_first_search.hpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,8 +2,8 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_BREADTH_FIRST_SEARCH_HPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_BREADTH_FIRST_SEARCH_HPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_BREADTH_FIRST_SEARCH_HPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_BREADTH_FIRST_SEARCH_HPP_INCLUDED

#include <boost/msm/mpl_graph/mpl_graph.hpp>

@@ -19,7 +19,7 @@
#include "search_colors.hpp"

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {

// bfs takes a visitor which has all the bgl-like metafunctions encapsulated in an
@@ -160,8 +160,8 @@
{};

} // namespace mpl_graph
-} // namespace metagraph
+} // namespace msm
} // namespace boost

-#endif // BOOST_METAGRAPH_MPL_GRAPH_BREADTH_FIRST_SEARCH_HPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_BREADTH_FIRST_SEARCH_HPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/depth_first_search.hpp
==============================================================================
--- trunk/boost/msm/mpl_graph/depth_first_search.hpp (original)
+++ trunk/boost/msm/mpl_graph/depth_first_search.hpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,8 +2,8 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_DEPTH_FIRST_SEARCH_HPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_DEPTH_FIRST_SEARCH_HPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_DEPTH_FIRST_SEARCH_HPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_DEPTH_FIRST_SEARCH_HPP_INCLUDED

#include <boost/msm/mpl_graph/mpl_graph.hpp>

@@ -16,7 +16,7 @@
#include "search_colors.hpp"

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {

// dfs takes a visitor which has all the bgl-like metafunctions encapsulated in an
@@ -115,8 +115,8 @@
{};

} // namespace mpl_graph
-} // namespace metagraph
+} // namespace msm
} // namespace boost

-#endif // BOOST_METAGRAPH_MPL_GRAPH_DEPTH_FIRST_SEARCH_HPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_DEPTH_FIRST_SEARCH_HPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/detail/adjacency_list_graph.ipp
==============================================================================
--- trunk/boost/msm/mpl_graph/detail/adjacency_list_graph.ipp (original)
+++ trunk/boost/msm/mpl_graph/detail/adjacency_list_graph.ipp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,8 +2,8 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_DETAIL_ADJACENCY_LIST_GRAPH_IPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_DETAIL_ADJACENCY_LIST_GRAPH_IPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_DETAIL_ADJACENCY_LIST_GRAPH_IPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_DETAIL_ADJACENCY_LIST_GRAPH_IPP_INCLUDED

// implementation of a graph declared in adjacency list format
// sequence< pair< source_vertex, sequence< pair<edge, target_vertex> > > >
@@ -21,7 +21,7 @@
#include <boost/mpl/push_back.hpp>

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {
namespace detail {

@@ -124,5 +124,5 @@
}
}

-#endif // BOOST_METAGRAPH_MPL_GRAPH_DETAIL_ADJACENCY_LIST_GRAPH_IPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_DETAIL_ADJACENCY_LIST_GRAPH_IPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/detail/graph_implementation_interface.ipp
==============================================================================
--- trunk/boost/msm/mpl_graph/detail/graph_implementation_interface.ipp (original)
+++ trunk/boost/msm/mpl_graph/detail/graph_implementation_interface.ipp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,14 +2,14 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_DETAIL_GRAPH_IMPLEMENTATION_INTERFACE_IPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_DETAIL_GRAPH_IMPLEMENTATION_INTERFACE_IPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_DETAIL_GRAPH_IMPLEMENTATION_INTERFACE_IPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_DETAIL_GRAPH_IMPLEMENTATION_INTERFACE_IPP_INCLUDED

// forward definitions of the producer metafunctions that need to be specialized for
// each graph representation

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {
namespace detail {

@@ -38,5 +38,5 @@
}
}

-#endif // BOOST_METAGRAPH_MPL_GRAPH_DETAIL_GRAPH_IMPLEMENTATION_INTERFACE_IPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_DETAIL_GRAPH_IMPLEMENTATION_INTERFACE_IPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/detail/incidence_list_graph.ipp
==============================================================================
--- trunk/boost/msm/mpl_graph/detail/incidence_list_graph.ipp (original)
+++ trunk/boost/msm/mpl_graph/detail/incidence_list_graph.ipp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,9 +2,9 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_DETAIL_INCIDENCE_LIST_GRAPH_IPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_DETAIL_INCIDENCE_LIST_GRAPH_IPP_INCLUDED

-#define BOOST_METAGRAPH_MPL_GRAPH_DETAIL_INCIDENCE_LIST_GRAPH_IPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_DETAIL_INCIDENCE_LIST_GRAPH_IPP_INCLUDED

// these metafunctions provide the metadata structures needed by the public interface
// in mpl_graph.hpp
@@ -40,7 +40,7 @@

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {
namespace detail {

@@ -103,4 +103,4 @@
}
}

-#endif // BOOST_METAGRAPH_MPL_GRAPH_DETAIL_INCIDENCE_LIST_GRAPH_IPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_DETAIL_INCIDENCE_LIST_GRAPH_IPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/incidence_list_graph.hpp
==============================================================================
--- trunk/boost/msm/mpl_graph/incidence_list_graph.hpp (original)
+++ trunk/boost/msm/mpl_graph/incidence_list_graph.hpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,8 +2,8 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_INCIDENCE_LIST_GRAPH_HPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_INCIDENCE_LIST_GRAPH_HPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_INCIDENCE_LIST_GRAPH_HPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_INCIDENCE_LIST_GRAPH_HPP_INCLUDED

// graph implementation based on a an mpl sequence of sequences <Edge,Source,Target>

@@ -18,7 +18,7 @@
#include <boost/msm/mpl_graph/detail/incidence_list_graph.ipp>

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {

template<typename EdgeSequence>
@@ -31,4 +31,4 @@
}
}

-#endif // BOOST_METAGRAPH_MPL_GRAPH_INCIDENCE_LIST_GRAPH_HPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_INCIDENCE_LIST_GRAPH_HPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/mpl_graph.hpp
==============================================================================
--- trunk/boost/msm/mpl_graph/mpl_graph.hpp (original)
+++ trunk/boost/msm/mpl_graph/mpl_graph.hpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -9,8 +9,8 @@
// (See accompanying file LICENSEmpl::_1_0.txt or copy at
// http://www.boost.org/LICENSEmpl::_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_MPL_GRAPH_HPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_MPL_GRAPH_HPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_MPL_GRAPH_HPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_MPL_GRAPH_HPP_INCLUDED

#include <boost/msm/mpl_graph/detail/graph_implementation_interface.ipp>

@@ -25,7 +25,7 @@
#include <boost/mpl/back_inserter.hpp>

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {

// Boost Graph concepts, MPL style
@@ -108,7 +108,7 @@
// source and target are defined in IncidenceGraph

} // mpl_graph
-} // metagraph
+} // msm
} // boost

-#endif // BOOST_METAGRAPH_MPL_GRAPH_MPL_GRAPH_HPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_MPL_GRAPH_HPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/mpl_utils.hpp
==============================================================================
--- trunk/boost/msm/mpl_graph/mpl_utils.hpp (original)
+++ trunk/boost/msm/mpl_graph/mpl_utils.hpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,8 +2,8 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_MPL_UTILS_HPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_MPL_UTILS_HPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_MPL_UTILS_HPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_MPL_UTILS_HPP_INCLUDED

#include <boost/mpl/fold.hpp>
#include <boost/mpl/map.hpp>
@@ -15,7 +15,7 @@
#include <boost/mpl/and.hpp>

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {
namespace mpl_utils {

@@ -59,4 +59,4 @@
}
}

-#endif // BOOST_METAGRAPH_MPL_GRAPH_MPL_UTILS_HPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_MPL_UTILS_HPP_INCLUDED

Modified: trunk/boost/msm/mpl_graph/search_colors.hpp
==============================================================================
--- trunk/boost/msm/mpl_graph/search_colors.hpp (original)
+++ trunk/boost/msm/mpl_graph/search_colors.hpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -2,11 +2,11 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_METAGRAPH_MPL_GRAPH_SEARCH_COLORS_HPP_INCLUDED
-#define BOOST_METAGRAPH_MPL_GRAPH_SEARCH_COLORS_HPP_INCLUDED
+#ifndef BOOST_MSM_MPL_GRAPH_SEARCH_COLORS_HPP_INCLUDED
+#define BOOST_MSM_MPL_GRAPH_SEARCH_COLORS_HPP_INCLUDED

namespace boost {
-namespace metagraph {
+namespace msm {
namespace mpl_graph {

namespace search_colors {
@@ -32,8 +32,8 @@

} // namespace mpl_graph
-} // namespace metagraph
+} // namespace msm
} // namespace boost

-#endif // BOOST_METAGRAPH_MPL_GRAPH_SEARCH_COLORS_HPP_INCLUDED
+#endif // BOOST_MSM_MPL_GRAPH_SEARCH_COLORS_HPP_INCLUDED

Modified: trunk/libs/msm/example/mpl_graph/adjacency_list_graph.cpp
==============================================================================
--- trunk/libs/msm/example/mpl_graph/adjacency_list_graph.cpp (original)
+++ trunk/libs/msm/example/mpl_graph/adjacency_list_graph.cpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -10,7 +10,7 @@
#include <boost/mpl/equal.hpp>

-namespace mpl_graph = boost::metagraph::mpl_graph;
+namespace mpl_graph = boost::msm::mpl_graph;
namespace mpl_utils = mpl_graph::mpl_utils;
namespace mpl = boost::mpl;

Modified: trunk/libs/msm/example/mpl_graph/breadth_first_search.cpp
==============================================================================
--- trunk/libs/msm/example/mpl_graph/breadth_first_search.cpp (original)
+++ trunk/libs/msm/example/mpl_graph/breadth_first_search.cpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -8,7 +8,7 @@

#include <iostream>

-namespace mpl_graph = boost::metagraph::mpl_graph;
+namespace mpl_graph = boost::msm::mpl_graph;
namespace mpl = boost::mpl;

// vertices

Modified: trunk/libs/msm/example/mpl_graph/depth_first_search.cpp
==============================================================================
--- trunk/libs/msm/example/mpl_graph/depth_first_search.cpp (original)
+++ trunk/libs/msm/example/mpl_graph/depth_first_search.cpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -8,7 +8,7 @@

#include <iostream>

-namespace mpl_graph = boost::metagraph::mpl_graph;
+namespace mpl_graph = boost::msm::mpl_graph;
namespace mpl = boost::mpl;

// vertices

Modified: trunk/libs/msm/example/mpl_graph/incidence_list_graph.cpp
==============================================================================
--- trunk/libs/msm/example/mpl_graph/incidence_list_graph.cpp (original)
+++ trunk/libs/msm/example/mpl_graph/incidence_list_graph.cpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -8,7 +8,7 @@
#include <boost/msm/mpl_graph/incidence_list_graph.hpp>
#include <boost/msm/mpl_graph/mpl_utils.hpp>

-namespace mpl_graph = boost::metagraph::mpl_graph;
+namespace mpl_graph = boost::msm::mpl_graph;
namespace mpl_utils = mpl_graph::mpl_utils;
namespace mpl = boost::mpl;
/*

Modified: trunk/libs/msm/example/mpl_graph/msm_adaptor.cpp
==============================================================================
--- trunk/libs/msm/example/mpl_graph/msm_adaptor.cpp (original)
+++ trunk/libs/msm/example/mpl_graph/msm_adaptor.cpp 2010-11-16 21:07:46 EST (Tue, 16 Nov 2010)
@@ -26,7 +26,7 @@
namespace msm = boost::msm;
namespace mpl = boost::mpl;

-namespace mpl_graph = boost::metagraph::mpl_graph;
+namespace mpl_graph = boost::msm::mpl_graph;

namespace
{

Date view	Thread view	Subject view	Author view

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