Subject: [Boost-commit] svn:boost r50092 - in sandbox/dataflow-rewrite: boost/dataflow/blueprint boost/dataflow/managed libs/dataflow/test/managed
From: stipe_at_[hidden]
Date: 2008-12-03 14:15:18
Author: srajko
Date: 2008-12-03 14:15:17 EST (Wed, 03 Dec 2008)
New Revision: 50092
URL: http://svn.boost.org/trac/boost/changeset/50092
Log:
managed network correctly reports context type
Text files modified:
sandbox/dataflow-rewrite/boost/dataflow/blueprint/framework_context.hpp | 6 +++---
sandbox/dataflow-rewrite/boost/dataflow/managed/support.hpp | 4 +++-
sandbox/dataflow-rewrite/libs/dataflow/test/managed/test_port.cpp | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
Modified: sandbox/dataflow-rewrite/boost/dataflow/blueprint/framework_context.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/blueprint/framework_context.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/blueprint/framework_context.hpp 2008-12-03 14:15:17 EST (Wed, 03 Dec 2008)
@@ -6,8 +6,8 @@
http://www.boost.org/LICENSE_1_0.txt)
-----------------------------------------------===============================*/
-#ifndef BOOST__DATAFLOW__BLUEPRINT__FRAMEWORK_OBJECT_HPP
-#define BOOST__DATAFLOW__BLUEPRINT__FRAMEWORK_OBJECT_HPP
+#ifndef BOOST__DATAFLOW__BLUEPRINT__FRAMEWORK_CONTEXT_HPP
+#define BOOST__DATAFLOW__BLUEPRINT__FRAMEWORK_CONTEXT_HPP
#include <map>
#include <typeinfo>
@@ -136,4 +136,4 @@
} } } // namespace boost::dataflow::blueprint
-#endif // BOOST__DATAFLOW__BLUEPRINT__FRAMEWORK_OBJECT_HPP
+#endif // BOOST__DATAFLOW__BLUEPRINT__FRAMEWORK_CONTEXT_HPP
Modified: sandbox/dataflow-rewrite/boost/dataflow/managed/support.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/managed/support.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/managed/support.hpp 2008-12-03 14:15:17 EST (Wed, 03 Dec 2008)
@@ -10,7 +10,9 @@
namespace boost { namespace dataflow { namespace managed {
-struct framework : public dataflow::framework<operations::connect> {};
+class network;
+
+struct framework : public dataflow::framework<operations::connect, network> {};
} } }
Modified: sandbox/dataflow-rewrite/libs/dataflow/test/managed/test_port.cpp
==============================================================================
--- sandbox/dataflow-rewrite/libs/dataflow/test/managed/test_port.cpp (original)
+++ sandbox/dataflow-rewrite/libs/dataflow/test/managed/test_port.cpp 2008-12-03 14:15:17 EST (Wed, 03 Dec 2008)
@@ -14,6 +14,8 @@
using namespace boost;
namespace df=boost::dataflow;
+ BOOST_CHECK((df::has_framework_context<df::managed::framework>::value));
+
df::managed::network network;
df::managed::component input_component(network);
df::managed::component output_component(network);