From: stipe_at_[hidden]
Date: 2007-11-28 17:00:56
Author: srajko
Date: 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
New Revision: 41443
URL: http://svn.boost.org/trac/boost/changeset/41443
Log:
fix msvc bugs - binary_operation_impl::not_specialized, storage::modification instead of storage::member, ...
Text files modified:
sandbox/SOC/2007/signals/boost/dataflow/blueprint/port_t.hpp | 4
sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp | 12 +
sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp | 22 +---
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj | 120 +++++++++++++-------------
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj | 179 +++++++++++++++++++--------------------
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj | 106 +++++++++++------------
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj | 154 ++++++++++++++++-----------------
sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp | 2
sandbox/SOC/2007/signals/libs/dataflow/example/signals/gil_example.cpp | 2
sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_multi_out.cpp | 2
10 files changed, 297 insertions(+), 306 deletions(-)
Modified: sandbox/SOC/2007/signals/boost/dataflow/blueprint/port_t.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/blueprint/port_t.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/blueprint/port_t.hpp 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -57,7 +57,7 @@
BOOST_MPL_ASSERT((is_same<Enable, void>));
public:
- port_t(typename call_traits<Port>::const_reference p)
+ port_t(typename initializer_type<Port>::type p)
: port_t_base<port, PortTraits, Port>(p)
{}
virtual port *clone() const
@@ -153,7 +153,7 @@
if(operation_uuid == runtime::property<operations::connect, int>()())
return dataflow::are_binary_operable<
operations::connect, typename PortTraits::mechanism, producer_type, consumer_type>::type::value;
-
+
if(operation_uuid == runtime::property<operations::extract, int>()())
return typename dataflow::are_binary_operable<
operations::extract, typename PortTraits::mechanism, producer_type, consumer_type>::type();
Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -53,6 +53,7 @@
typedef typename boost::fusion::result_of::as_vector<storable_types >::type storable_vector;
storage_modifier(bool opened=true) : opened(opened) {}
+ storage_modifier(const storage_modifier &rhs) : stored(rhs.stored), opened(rhs.opened) {}
template<typename Seq>
storage_modifier(const Seq &seq, bool opened=true) : stored(seq), opened(opened) {}
@@ -98,6 +99,7 @@
{
protected:
typedef conditional_modifier<storage_modifier<Signature>, Signature, OutSignal, Combiner, Group, GroupCompare> base_type;
+ using base_type::modification;
public:
typedef typename storage_modifier<Signature>::parameter_types parameter_types;
@@ -113,17 +115,19 @@
> port_traits;
+ storage(const storage &rhs) : base_type(rhs.modification) {}
+
/** Initializes the stored parameter values using the provided sequence.
\param[in] seq Sequence from which the stored parameter sequence is initialized from.
*/
template<typename Seq>
- storage(const Seq &seq) : base_type(seq) {}
+ storage(const Seq &seq, bool opened=true) : base_type(seq, opened) {}
/** Initializes the stored parameter values using its default constructor.
*/
storage() {}
- void open() {base_type::member.open();}
- void close() {base_type::member.close();}
+ void open() {base_type::modification.open();}
+ void close() {base_type::modification.close();}
/** Sends a signal containing the stored parameter values.
\return Return value of the sent signal.
@@ -141,7 +145,7 @@
{
return send();
}
- typename base_type::signal_type::result_type call(const function<typename base_type::signature_type> &f)
+ typename base_type::signal_type::result_type call(const boost::function<typename base_type::signature_type> &f)
{
boost::fusion::fused<function<typename base_type::signature_type> const &> fused_out(f);
return fused_out(base_type::modification.stored);
Modified: sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/support/binary_operation.hpp 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -19,10 +19,7 @@
template<typename Operation, typename ProducerTag, typename ConsumerTag, typename Enable=void>
struct binary_operation_impl
{
- struct detail
- {
- typedef void not_specialized;
- };
+ typedef void not_specialized;
template<typename Producer, typename Consumer>
void operator()(Producer &, Consumer &)
@@ -37,13 +34,10 @@
template<typename Operation, typename Mechanism, typename Producer, typename Consumer>
inline void binary_operation(Producer &producer, Consumer &consumer)
{
- typedef typename boost::remove_cv<Producer>::type ProducerNoCV;
- typedef typename boost::remove_cv<Consumer>::type ConsumerNoCV;
-
extension::binary_operation_impl<
Operation,
- typename port_traits_of<Mechanism, ports::producer, ProducerNoCV>::type,
- typename port_traits_of<Mechanism, ports::consumer, ConsumerNoCV>::type>
+ typename port_traits_of<Mechanism, ports::producer, Producer>::type,
+ typename port_traits_of<Mechanism, ports::consumer, Consumer>::type>
()(get_port<Mechanism, ports::producer>(producer),
get_port<Mechanism, ports::consumer>(consumer));
}
@@ -71,9 +65,9 @@
typename detail::enable_if_defined<
typename extension::binary_operation_impl<
Operation,
- typename port_traits_of<Mechanism, ports::producer, typename boost::remove_cv<Producer>::type>::type,
- typename port_traits_of<Mechanism, ports::consumer, typename boost::remove_cv<Consumer>::type>::type
- >::detail::not_specialized
+ typename port_traits_of<Mechanism, ports::producer, Producer>::type,
+ typename port_traits_of<Mechanism, ports::consumer, Consumer>::type
+ >::not_specialized
>::type
>
: public mpl::false_ {};
@@ -86,8 +80,8 @@
Consumer,
typename enable_if<
mpl::and_<
- is_port<Mechanism, ports::producer, typename boost::remove_cv<Producer>::type>,
- is_port<Mechanism, ports::consumer, typename boost::remove_cv<Consumer>::type>,
+ is_port<Mechanism, ports::producer, Producer>,
+ is_port<Mechanism, ports::consumer, Consumer>,
specialized_binary_operation<Operation,Mechanism,Producer,Consumer>
>
>::type
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="build"
- ProjectGUID="{57094754-267b-4a64-9863-e12326346271}"
+ ProjectGUID="{57094754-267B-4A64-9863-E12326346271}"
>
<Platforms>
<Platform
@@ -24,7 +24,6 @@
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -45,7 +44,6 @@
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -70,11 +68,11 @@
Name="connection"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\connection\operators.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\connection\group.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\connection\group.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\connection\operators.hpp"
>
</File>
<File
@@ -94,11 +92,11 @@
Name="detail"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\detail\make_ref.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\detail\enable_if_defined.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\detail\enable_if_defined.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\detail\make_ref.hpp"
>
</File>
</Filter>
@@ -106,31 +104,31 @@
Name="phoenix"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\static_function.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\advance.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\support.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\components.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\advance.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\producer_container.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\static_value.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\sequence_environment.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\components.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\static_function.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\sequence_environment.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\static_value.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\producer_container.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\support.hpp"
>
</File>
<Filter
@@ -149,7 +147,7 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\component\producer_accumulator.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\consumer.hpp"
>
</File>
<File
@@ -157,11 +155,11 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\component\producer_wrapper.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\producer_accumulator.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\phoenix\component\consumer.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\phoenix\component\producer_wrapper.hpp"
>
</File>
</Filter>
@@ -178,7 +176,7 @@
Name="support"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\filter.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\binary_operation.hpp"
>
</File>
<File
@@ -186,31 +184,31 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\invocable.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\component.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\binary_operation.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\component_operation.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\port.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\filter.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\keyed_port.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\invocable.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\proxy_port.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\keyed_port.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\unary_operation.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\port.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\component_operation.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\proxy_port.hpp"
>
</File>
<File
@@ -218,7 +216,7 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\component.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\unary_operation.hpp"
>
</File>
<Filter
@@ -228,11 +226,11 @@
Name="detail"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\port\detail\proxy_port_traits_sequence.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\port\detail\port_traits_sequence.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\support\port\detail\port_traits_sequence.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\support\port\detail\proxy_port_traits_sequence.hpp"
>
</File>
</Filter>
@@ -258,11 +256,11 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\support.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\runtime_support.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\runtime_support.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\support.hpp"
>
</File>
<Filter
@@ -280,15 +278,15 @@
Name="detail"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\replace_return_type.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\bind_object.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\result_of_defined.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\replace_return_type.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\bind_object.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\connection\detail\result_of_defined.hpp"
>
</File>
<File
@@ -301,67 +299,67 @@
Name="component"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\junction.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\applicator.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\modifier.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\chain.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\applicator.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\condition.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\mutex.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional_templated.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional_modifier.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional_templated.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\timed_generator.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\counter.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\socket_receiver.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\filter.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\instantiator.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\filter_base.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\filter_base.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\function.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\counter.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\instantiator.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\conditional_modifier.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\junction.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\chain.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\modifier.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\function.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\multiplexer.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\filter.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\mutex.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\condition.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\socket_receiver.hpp"
>
</File>
<File
@@ -373,14 +371,14 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\multiplexer.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\timed_generator.hpp"
>
</File>
<Filter
Name="detail"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\storable.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\generic_template.hpp"
>
</File>
<File
@@ -388,11 +386,11 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\unfused_inherited.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\storable.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\generic_template.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\signals\component\detail\unfused_inherited.hpp"
>
</File>
<File
@@ -418,11 +416,11 @@
Name="utility"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\utility\underlying_type.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\utility\copy_cv.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\utility\copy_cv.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\utility\underlying_type.hpp"
>
</File>
</Filter>
@@ -430,7 +428,7 @@
Name="blueprint"
>
<File
- RelativePath="..\..\..\..\boost\dataflow\blueprint\network.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\component.hpp"
>
</File>
<File
@@ -438,15 +436,15 @@
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\blueprint\component.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\connection_t.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\blueprint\connection_t.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\get_port.hpp"
>
</File>
<File
- RelativePath="..\..\..\..\boost\dataflow\blueprint\get_port.hpp"
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\network.hpp"
>
</File>
<File
@@ -467,11 +465,11 @@
>
</File>
<File
- RelativePath="..\..\..\..\project-root.jam"
+ RelativePath="..\..\..\..\Jamfile.v2"
>
</File>
<File
- RelativePath="..\..\..\..\Jamfile.v2"
+ RelativePath="..\..\..\..\project-root.jam"
>
</File>
</Filter>
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/doc.vcproj 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -3,28 +3,27 @@
ProjectType="Visual C++"
Version="8.00"
Name="doc"
- ProjectGUID="{bbaad8a1-8792-4eae-9899-20c359b62645}"
+ ProjectGUID="{BBAAD8A1-8792-4EAE-9899-20C359B62645}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="cd ../../doc
bjam --v2 $(ConfigurationName)"
ReBuildCommandLine="cd ../../doc
bjam --v2 -a $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -33,79 +32,11 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\doc\dataflow1.svg"
- >
- </File>
- <File
- RelativePath="..\..\doc\dataflow2.svg"
- >
- </File>
- <File
- RelativePath="..\..\doc\dataflow3.svg"
- >
- </File>
- <File
- RelativePath="..\..\doc\dataflow1.png"
- >
- </File>
- <File
- RelativePath="..\..\doc\dataflow2.png"
- >
- </File>
- <File
- RelativePath="..\..\doc\dataflow3.png"
- >
- </File>
- <File
- RelativePath="..\..\doc\phoenix.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\dataflow_table.xml"
- >
- </File>
- <File
- RelativePath="..\..\doc\Jamfile.v2"
- >
- </File>
- <File
- RelativePath="..\..\doc\components.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\signals.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\future.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\concepts.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\rationale.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\introduction.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\port_concepts.qbk"
- >
- </File>
- <File
- RelativePath="..\..\doc\dataflow.qbk"
- >
- </File>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
<Filter
Name="signals"
>
@@ -118,11 +49,11 @@
>
</File>
<File
- RelativePath="..\..\doc\signals\introduction.qbk"
+ RelativePath="..\..\doc\signals\connections.qbk"
>
</File>
<File
- RelativePath="..\..\doc\signals\connections.qbk"
+ RelativePath="..\..\doc\signals\introduction.qbk"
>
</File>
</Filter>
@@ -138,7 +69,7 @@
Name="introduction"
>
<File
- RelativePath="..\..\doc\introduction\gil_example.qbk"
+ RelativePath="..\..\doc\introduction\blueprint_example.qbk"
>
</File>
<File
@@ -146,7 +77,7 @@
>
</File>
<File
- RelativePath="..\..\doc\introduction\blueprint_example.qbk"
+ RelativePath="..\..\doc\introduction\gil_example.qbk"
>
</File>
<File
@@ -162,7 +93,75 @@
>
</File>
</Filter>
- </Files>
- <Globals>
- </Globals>
+ <File
+ RelativePath="..\..\doc\components.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\concepts.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow1.png"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow1.svg"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow2.png"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow2.svg"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow3.png"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow3.svg"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\dataflow_table.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\future.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\introduction.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\Jamfile.v2"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\phoenix.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\port_concepts.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\rationale.qbk"
+ >
+ </File>
+ <File
+ RelativePath="..\..\doc\signals.qbk"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -3,28 +3,27 @@
ProjectType="Visual C++"
Version="8.00"
Name="example"
- ProjectGUID="{81616215-ae99-438d-acff-896032940990}"
+ ProjectGUID="{81616215-AE99-438D-ACFF-896032940990}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="debug|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -33,19 +32,18 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- <Configuration
+ </Configuration>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -54,60 +52,40 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\example\edit_distance.cpp"
- >
- </File>
- <File
- RelativePath="..\..\example\fibonacci.cpp"
- >
- </File>
- <File
- RelativePath="..\..\example\example.cpp"
- >
- </File>
- <File
- RelativePath="..\..\example\timing_example.cpp"
- >
- </File>
- <File
- RelativePath="..\..\example\Jamfile.v2"
- >
- </File>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
<Filter
Name="VTK"
>
<File
- RelativePath="..\..\example\VTK\Cone3.cxx"
+ RelativePath="..\..\example\VTK\Cone.cxx"
>
</File>
<File
- RelativePath="..\..\example\VTK\Cone4.cxx"
+ RelativePath="..\..\example\VTK\Cone2.cxx"
>
</File>
<File
- RelativePath="..\..\example\VTK\Cone5.cxx"
+ RelativePath="..\..\example\VTK\Cone3.cxx"
>
</File>
<File
- RelativePath="..\..\example\VTK\Cone6.cxx"
+ RelativePath="..\..\example\VTK\Cone4.cxx"
>
</File>
<File
- RelativePath="..\..\example\VTK\Jamfile.v2"
+ RelativePath="..\..\example\VTK\Cone5.cxx"
>
</File>
<File
- RelativePath="..\..\example\VTK\Cone.cxx"
+ RelativePath="..\..\example\VTK\Cone6.cxx"
>
</File>
<File
- RelativePath="..\..\example\VTK\Cone2.cxx"
+ RelativePath="..\..\example\VTK\Jamfile.v2"
>
</File>
<File
@@ -119,15 +97,15 @@
Name="signals"
>
<File
- RelativePath="..\..\example\signals\simple_example_components.hpp"
+ RelativePath="..\..\example\signals\gil_example.cpp"
>
</File>
<File
- RelativePath="..\..\example\signals\simple_example.cpp"
+ RelativePath="..\..\example\signals\intro_example.cpp"
>
</File>
<File
- RelativePath="..\..\example\signals\intro_example.cpp"
+ RelativePath="..\..\example\signals\Jamfile.v2"
>
</File>
<File
@@ -135,11 +113,11 @@
>
</File>
<File
- RelativePath="..\..\example\signals\gil_example.cpp"
+ RelativePath="..\..\example\signals\simple_example.cpp"
>
</File>
<File
- RelativePath="..\..\example\signals\Jamfile.v2"
+ RelativePath="..\..\example\signals\simple_example_components.hpp"
>
</File>
</Filter>
@@ -155,7 +133,27 @@
>
</File>
</Filter>
- </Files>
- <Globals>
- </Globals>
+ <File
+ RelativePath="..\..\example\edit_distance.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fibonacci.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\Jamfile.v2"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\timing_example.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -3,28 +3,27 @@
ProjectType="Visual C++"
Version="8.00"
Name="test"
- ProjectGUID="{151e2151-a02d-4748-aba6-f75a68d72cca}"
+ ProjectGUID="{151E2151-A02D-4748-ABA6-F75A68D72CCA}"
>
- <Platforms>
- <Platform
+ <Platforms>
+ <Platform
Name="Win32"
/>
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
Name="debug|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -33,19 +32,18 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- <Configuration
+ </Configuration>
+ <Configuration
Name="release|Win32"
OutputDirectory="..\..\..\..\bin.v2\libs\$(SolutionName)\$(ProjectName)\msvc-8.0\$(ConfigurationName)\threading-multi"
IntermediateDirectory="$(OutDir)"
ConfigurationType="0"
>
- <Tool
+ <Tool
Name="VCNMakeTool"
BuildCommandLine="bjam --v2 ../../$(ProjectName) $(ConfigurationName)"
ReBuildCommandLine="bjam --v2 -a ../../$(ProjectName) $(ConfigurationName)"
CleanCommandLine="bjam --v2 --clean ../../$(ProjectName) $(ConfigurationName)"
-
Output=""
PreprocessorDefinitions=""
IncludeSearchPath=""
@@ -54,72 +52,36 @@
ForcedUsingAssemblies=""
CompileAsManaged=""
/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath="..\..\test\test_binary_op.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_keyed_port.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_proxy_port.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\my_producer_consumer.hpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_unary_op.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_component.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_port.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\test_reflective_component.cpp"
- >
- </File>
- <File
- RelativePath="..\..\test\Jamfile.v2"
- >
- </File>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
<Filter
Name="signals"
>
<File
- RelativePath="..\..\test\signals\test_mutex.cpp"
+ RelativePath="..\..\test\signals\Jamfile.v2"
>
</File>
<File
- RelativePath="..\..\test\signals\test_storage.cpp"
+ RelativePath="..\..\test\signals\test_bind_object.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_multi_args.cpp"
+ RelativePath="..\..\test\signals\test_branching.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_multiplexer.cpp"
+ RelativePath="..\..\test\signals\test_chain.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_pull.cpp"
+ RelativePath="..\..\test\signals\test_connect.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\Jamfile.v2"
+ RelativePath="..\..\test\signals\test_connections.cpp"
>
</File>
<File
@@ -127,63 +89,99 @@
>
</File>
<File
- RelativePath="..\..\test\signals\test_result_of_defined.cpp"
+ RelativePath="..\..\test\signals\test_disconnect.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_multi_out.cpp"
+ RelativePath="..\..\test\signals\test_filter.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_connections.cpp"
+ RelativePath="..\..\test\signals\test_function.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_chain.cpp"
+ RelativePath="..\..\test\signals\test_junction.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_function.cpp"
+ RelativePath="..\..\test\signals\test_multi_args.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_filter.cpp"
+ RelativePath="..\..\test\signals\test_multi_out.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_same_type.cpp"
+ RelativePath="..\..\test\signals\test_multi_type.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_socket.cpp"
+ RelativePath="..\..\test\signals\test_multiplexer.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_junction.cpp"
+ RelativePath="..\..\test\signals\test_mutex.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_disconnect.cpp"
+ RelativePath="..\..\test\signals\test_pull.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_connect.cpp"
+ RelativePath="..\..\test\signals\test_result_of_defined.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_multi_type.cpp"
+ RelativePath="..\..\test\signals\test_same_type.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_branching.cpp"
+ RelativePath="..\..\test\signals\test_socket.cpp"
>
</File>
<File
- RelativePath="..\..\test\signals\test_bind_object.cpp"
+ RelativePath="..\..\test\signals\test_storage.cpp"
>
</File>
</Filter>
- </Files>
- <Globals>
- </Globals>
+ <File
+ RelativePath="..\..\test\Jamfile.v2"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\my_producer_consumer.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_binary_op.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_component.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_keyed_port.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_port.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_proxy_port.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_reflective_component.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\test_unary_op.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/blueprint/blueprint_example.cpp 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -38,7 +38,7 @@
sink_float = network.add_component<signals::storage<void(float)> >(0.0f);
}
void run()
- {
+ {
// Print some runtime port info
std::cout << "Printing runtime info about all of the components:" << std::endl << std::endl;
print_port_info("source", source);
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/signals/gil_example.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/signals/gil_example.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/signals/gil_example.cpp 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -79,7 +79,7 @@
gil::gray8_pixel_t operator()(const gil::gray8_pixel_t& p) const
{
- return gil::gray8_pixel_t(p + generator());
+ return gil::gray8_pixel_t(p + gil::bits8(generator()));
}
variate_generator<mt19937&, boost::normal_distribution<> > &generator;
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_multi_out.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_multi_out.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_multi_out.cpp 2007-11-28 17:00:55 EST (Wed, 28 Nov 2007)
@@ -34,7 +34,7 @@
//[ test_multi_out_unfused
SignalOutIntFloat multi_out(2.5f);
- signals::storage<void (float)> float_collector(0);
+ signals::storage<void (float)> float_collector(0.0f);
signals::storage<void (int)> int_collector(0);
multi_out >>= float_collector;