Subject: [Boost-commit] svn:boost r50208 - in sandbox/dataflow-rewrite: boost/dataflow/blueprint boost/dataflow/managed libs/dataflow/build/xcodeide/dataflow.xcodeproj
From: stipe_at_[hidden]
Date: 2008-12-08 16:56:11
Author: srajko
Date: 2008-12-08 16:56:11 EST (Mon, 08 Dec 2008)
New Revision: 50208
URL: http://svn.boost.org/trac/boost/changeset/50208
Log:
adding symbol exports and fixed blueprint framework checking for port_binary_operation
Text files modified:
sandbox/dataflow-rewrite/boost/dataflow/blueprint/port.hpp | 2 +-
sandbox/dataflow-rewrite/boost/dataflow/blueprint/port_binary_operation.hpp | 8 ++++----
sandbox/dataflow-rewrite/boost/dataflow/managed/component.hpp | 10 ++++++----
sandbox/dataflow-rewrite/boost/dataflow/managed/network.hpp | 13 +++++++------
sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj | 2 ++
5 files changed, 20 insertions(+), 15 deletions(-)
Modified: sandbox/dataflow-rewrite/boost/dataflow/blueprint/port.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/blueprint/port.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/blueprint/port.hpp 2008-12-08 16:56:11 EST (Mon, 08 Dec 2008)
@@ -20,7 +20,7 @@
{
typedef framework_entity<BlueprintFramework> base_type;
public:
- port(framework_context<BlueprintFramework> &fo, const std::type_info &ti)
+ port(blueprint::framework_context<BlueprintFramework> &fo, const std::type_info &ti)
: base_type(fo, ti)
{}
struct dataflow_traits : public base_type::dataflow_traits
Modified: sandbox/dataflow-rewrite/boost/dataflow/blueprint/port_binary_operation.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/blueprint/port_binary_operation.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/blueprint/port_binary_operation.hpp 2008-12-08 16:56:11 EST (Mon, 08 Dec 2008)
@@ -23,8 +23,8 @@
struct port_binary_operation_impl<Traits1, Traits2, blueprint::operation,
typename enable_if<
mpl::and_<
- blueprint::is_blueprint_framework<typename traits_of<Traits1>::type::framework>,
- blueprint::is_blueprint_framework<typename traits_of<Traits2>::type::framework>
+ blueprint::is_blueprint_framework<typename Traits1::framework>,
+ blueprint::is_blueprint_framework<typename Traits2::framework>
>
>::type>
{
@@ -42,8 +42,8 @@
struct port_binary_operation_will_succeed_impl<Traits1, Traits2, blueprint::operation,
typename enable_if<
mpl::and_<
- blueprint::is_blueprint_framework<typename traits_of<Traits1>::type::framework>,
- blueprint::is_blueprint_framework<typename traits_of<Traits2>::type::framework>
+ blueprint::is_blueprint_framework<typename Traits1::framework>,
+ blueprint::is_blueprint_framework<typename Traits2::framework>
>
>::type>
{
Modified: sandbox/dataflow-rewrite/boost/dataflow/managed/component.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/managed/component.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/managed/component.hpp 2008-12-08 16:56:11 EST (Mon, 08 Dec 2008)
@@ -6,6 +6,8 @@
#ifndef BOOST_DATAFLOW_MANAGED_COMPONENT_HPP
#define BOOST_DATAFLOW_MANAGED_COMPONENT_HPP
+#include <boost/dataflow/utility/export_symbols.hpp>
+
namespace boost { namespace dataflow { namespace managed {
@@ -15,9 +17,9 @@
class component
{
public:
- component(network &network_context);
- component(const component &other);
- virtual ~component();
+ BOOST_EXPORT_SYMBOLS component(network &network_context);
+ BOOST_EXPORT_SYMBOLS component(const component &other);
+ virtual BOOST_EXPORT_SYMBOLS ~component();
network &network_context()
{ return m_network_context; }
virtual void invoke(){};
@@ -29,7 +31,7 @@
{
return m_topological_sort_index;
}
- void claim_port(port_base &p);
+ void BOOST_EXPORT_SYMBOLS claim_port(port_base &p);
private:
network &m_network_context;
unsigned m_topological_sort_index;
Modified: sandbox/dataflow-rewrite/boost/dataflow/managed/network.hpp
==============================================================================
--- sandbox/dataflow-rewrite/boost/dataflow/managed/network.hpp (original)
+++ sandbox/dataflow-rewrite/boost/dataflow/managed/network.hpp 2008-12-08 16:56:11 EST (Mon, 08 Dec 2008)
@@ -11,6 +11,7 @@
#include <boost/dataflow/generic/port.hpp>
#include <boost/dataflow/managed/component.hpp>
+#include <boost/dataflow/utility/export_symbols.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/topological_sort.hpp>
#include <boost/shared_ptr.hpp>
@@ -64,9 +65,9 @@
: m_io_service(service)
{}
- void register_component(component *c);
- void unregister_component(component *c);
- void notify_connect(component &producer, component &consumer);
+ void BOOST_EXPORT_SYMBOLS register_component(component *c);
+ void BOOST_EXPORT_SYMBOLS unregister_component(component *c);
+ void BOOST_EXPORT_SYMBOLS notify_connect(component &producer, component &consumer);
void notify_change(component &changed)
{
m_changed.insert(&changed);
@@ -77,8 +78,8 @@
return m_changed;
}
- void update_topological_sort();
- void update();
+ void BOOST_EXPORT_SYMBOLS update_topological_sort();
+ void BOOST_EXPORT_SYMBOLS update();
void set_io_service(boost::shared_ptr<asio::io_service> service)
{ m_io_service = service; }
@@ -92,7 +93,7 @@
return *m_io_service;
}
private:
- void post_async(const boost::function<void()> &f);
+ void BOOST_EXPORT_SYMBOLS post_async(const boost::function<void()> &f);
graph_type m_graph;
typedef std::map<component *, graph_type::vertex_descriptor> descriptor_map_type;
Modified: sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj
==============================================================================
--- sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj (original)
+++ sandbox/dataflow-rewrite/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj 2008-12-08 16:56:11 EST (Mon, 08 Dec 2008)
@@ -147,6 +147,7 @@
08A2279D0EAE427700F70466 /* Jamfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.jam; path = Jamfile; sourceTree = "<group>"; };
08A227A00EAE429600F70466 /* graph_framework.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = graph_framework.hpp; sourceTree = "<group>"; };
08A227A90EAE434300F70466 /* port.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = port.hpp; sourceTree = "<group>"; };
+ 08A48FC20EE9D64B002D6374 /* export_symbols.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = export_symbols.hpp; sourceTree = "<group>"; };
08A53F850EAC07E6000B9C17 /* blueprint_component.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = blueprint_component.hpp; sourceTree = "<group>"; };
08A53F8E0EAC0AC1000B9C17 /* factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = factory.hpp; sourceTree = "<group>"; };
08A53F920EAC14A4000B9C17 /* test_factory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_factory.cpp; sourceTree = "<group>"; };
@@ -391,6 +392,7 @@
08A77AEE0E4FB4C800B8793E /* is_type.hpp */,
0826E33A0EA53F4C0090AB4E /* all_of.hpp */,
089F03530EE9615200C88FE5 /* shared_ptr_to_element.hpp */,
+ 08A48FC20EE9D64B002D6374 /* export_symbols.hpp */,
);
path = utility;
sourceTree = "<group>";