|
|
Boost-Commit : |
From: stipe_at_[hidden]
Date: 2008-04-03 03:26:17
Author: srajko
Date: 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
New Revision: 44012
URL: http://svn.boost.org/trac/boost/changeset/44012
Log:
fltk_gui example now builds (but still has runtime errors)
Text files modified:
sandbox/SOC/2007/signals/boost/dataflow/blueprint/keyed_port_t.hpp | 7 +++++--
sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp | 2 +-
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj | 20 ++++++++++++++++++++
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj | 36 ++++++++++++++++++++++++++++++++++++
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/test.vcproj | 20 ++++++++++++++++++++
sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/BlueprintWindow.cpp | 2 +-
sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/Jamfile.v2 | 12 ++++++++++++
sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/fltk_gui_example.cpp | 4 +++-
sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2 | 1 -
9 files changed, 98 insertions(+), 6 deletions(-)
Modified: sandbox/SOC/2007/signals/boost/dataflow/blueprint/keyed_port_t.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/blueprint/keyed_port_t.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/blueprint/keyed_port_t.hpp 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -50,9 +50,12 @@
>::type >
: public detail::vector_port_impl<keyed_port, PortOrRef, Tag>
{
+ typedef detail::vector_port_impl<keyed_port, PortOrRef, Tag> base_type;
+ using base_type::port_traits_type;
+
typedef array<
const std::type_info *,
- mpl::size<typename port_t::port_traits_type::port_keys>::type::value
+ mpl::size<typename port_traits_type::port_keys>::type::value
> array_type;
public:
@@ -60,7 +63,7 @@
: detail::vector_port_impl<keyed_port, PortOrRef, Tag>(p)
{
mpl::for_each<
- typename port_t::port_traits_type::port_keys,
+ typename port_traits_type::port_keys,
detail::wrap_identity<mpl::_>
> (detail::fill_type_info<array_type>(m_type_info));
}
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 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -167,7 +167,7 @@
}
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);
+ boost::fusion::fused<boost::function<typename base_type::signature_type> const &> fused_out(f);
return fused_out(base_type::modification.stored);
}
/** \return A reference to the fusion vector of stored parameter values.
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 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -428,10 +428,22 @@
Name="blueprint"
>
<File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\binary_operation.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\binary_operation_t.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\boost\dataflow\blueprint\component.hpp"
>
</File>
<File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\component_bank.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\boost\dataflow\blueprint\connection.hpp"
>
</File>
@@ -444,6 +456,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\keyed_port_t.hpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\boost\dataflow\blueprint\network.hpp"
>
</File>
@@ -455,6 +471,10 @@
RelativePath="..\..\..\..\boost\dataflow\blueprint\port_t.hpp"
>
</File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\blueprint\vector_port_t.hpp"
+ >
+ </File>
</Filter>
</Filter>
<Filter
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 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -133,6 +133,42 @@
>
</File>
</Filter>
+ <Filter
+ Name="fltk_gui"
+ >
+ <File
+ RelativePath="..\..\example\fltk_gui\BlueprintBank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fltk_gui\BlueprintBank.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fltk_gui\BlueprintComponent.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fltk_gui\BlueprintComponent.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fltk_gui\BlueprintWindow.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fltk_gui\BlueprintWindow.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fltk_gui\fltk_gui_example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\fltk_gui\Jamfile.v2"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\..\example\edit_distance.cpp"
>
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 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -145,6 +145,26 @@
>
</File>
</Filter>
+ <Filter
+ Name="utility"
+ >
+ <File
+ RelativePath="..\..\test\utility\Jamfile.v2"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\utility\test_bind_mem_fn.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\utility\test_bind_mem_fn_overload.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\test\utility\test_forced_sequence.cpp"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\..\test\Jamfile.v2"
>
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/BlueprintWindow.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/BlueprintWindow.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/BlueprintWindow.cpp 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -96,7 +96,7 @@
{
int dx = x1 - x0;
int dy = y1 - y0;
- return sqrt(dx*dx+dy*dy);
+ return sqrt(double(dx*dx+dy*dy));
}
double distance(int x0, int y0, int x1, int y1, int xp, int yp)
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/Jamfile.v2 (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/Jamfile.v2 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -4,6 +4,12 @@
# http://www.boost.org/LICENSE_1_0.txt)
lib fltk : : <name>fltk2 ;
+lib user32 : : <name>User32 ;
+lib gdi32 : : <name>Gdi32 ;
+lib ws2_32 : : <name>Ws2_32 ;
+lib ole32 : : <name>ole32 ;
+lib shell32 : : <name>shell32 ;
+lib advapi32 : : <name>Advapi32 ;
project dataflow/example/blueprint
: requirements
@@ -12,6 +18,12 @@
<library>fltk
<define>BOOST_ALL_NO_LIB=1
<toolset>darwin:<linkflags>"-framework Carbon"
+ <toolset>msvc:<library>user32
+ <toolset>msvc:<library>gdi32
+ <toolset>msvc:<library>ws2_32
+ <toolset>msvc:<library>ole32
+ <toolset>msvc:<library>shell32
+ <toolset>msvc:<library>advapi32
;
exe fltk_gui_example : fltk_gui_example.cpp BlueprintWindow.cpp BlueprintBank.cpp BlueprintComponent.cpp ;
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/fltk_gui_example.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/fltk_gui_example.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/fltk_gui/fltk_gui_example.cpp 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -72,9 +72,11 @@
// Output and input components
add_component<output_valuator>("output");
add_component<input_valuator>("input");
- // A filter that doubles
+ // A filter that doubles (fails on MSVC)
+#ifndef BOOST_MSVC
add_component<signals::function<void (int), int(int)> >
("doubler", boost::function<int(int)>(boost::bind(std::multiplies<int>(), _1, 2)));
+#endif
}
};
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2 (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2 2008-04-03 03:26:16 EDT (Thu, 03 Apr 2008)
@@ -15,7 +15,6 @@
run test_filter_base.cpp ;
-run test_bind_object.cpp ;
run test_connect.cpp ;
run test_connect_result.cpp ;
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