From: stipe_at_[hidden]
Date: 2008-07-18 13:22:22
Author: srajko
Date: 2008-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
New Revision: 47574
URL: http://svn.boost.org/trac/boost/changeset/47574
Log:
tests and examples build on MSVC8
Text files modified:
sandbox/SOC/2007/signals/boost/dataflow/managed/port.hpp | 2
sandbox/SOC/2007/signals/boost/switch.hpp | 5 -
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/build.vcproj | 104 ++++++++++++++++++++++++++++++++++++++++
sandbox/SOC/2007/signals/libs/dataflow/build/vc8ide/example.vcproj | 36 +++++++++++++
sandbox/SOC/2007/signals/libs/dataflow/example/glv_gui/blueprint_window.cpp | 5 +
sandbox/SOC/2007/signals/libs/dataflow/example/glv_gui/glvgui_example.cpp | 7 +-
sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_lazy_sequence.cpp | 2
sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_vector_same_initialization.cpp | 6 +
8 files changed, 156 insertions(+), 11 deletions(-)
Modified: sandbox/SOC/2007/signals/boost/dataflow/managed/port.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/managed/port.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/managed/port.hpp 2008-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -59,7 +59,7 @@
public:
typedef producer_port_traits<T> dataflow_traits;
- port(component &component_context) : port_base(component_context)
+ port(component &component_context) : port_base(component_context), m_value()
{
};
void set(const T &value)
Modified: sandbox/SOC/2007/signals/boost/switch.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/switch.hpp (original)
+++ sandbox/SOC/2007/signals/boost/switch.hpp 2008-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -37,10 +37,9 @@
class bad_switch : public std::runtime_error {
public:
template<class Int>
- explicit bad_switch(Int v) :
+ explicit bad_switch(Int &v) :
std::runtime_error(
- "boost::switch_ default case called -- none provided. value is: " +
- boost::lexical_cast<std::string>(v)) {}
+ "boost::switch_ default case called -- none provided.") {}
};
namespace switch_detail {
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-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -476,6 +476,34 @@
>
</File>
</Filter>
+ <Filter
+ Name="managed"
+ >
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\managed\component.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\managed\fusion_component.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\managed\network.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\managed\port.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\managed\runtime_support.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\boost\dataflow\managed\support.hpp"
+ >
+ </File>
+ </Filter>
</Filter>
<Filter
Name="solution build"
@@ -493,6 +521,82 @@
>
</File>
</Filter>
+ <Filter
+ Name="glv"
+ >
+ <File
+ RelativePath="..\..\..\glv\include\glv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_abstract_binding.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_behavior.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_binding_carbon.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_binding_fltk.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_binding_glut.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_color.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_conf.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_core.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_draw.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_layout.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_observer_pattern.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_rect.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_sliders.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_texture.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_textview.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\include\glv_util.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\glv\Jamfile"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\..\build\Jamfile.v2"
>
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-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -169,6 +169,42 @@
>
</File>
</Filter>
+ <Filter
+ Name="glv_gui"
+ >
+ <File
+ RelativePath="..\..\example\glv_gui\blueprint_bank.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\glv_gui\blueprint_bank.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\glv_gui\blueprint_component.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\glv_gui\blueprint_component.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\glv_gui\blueprint_window.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\glv_gui\blueprint_window.hpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\glv_gui\glvgui_example.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\example\glv_gui\glvgui_logic.cpp"
+ >
+ </File>
+ </Filter>
<File
RelativePath="..\..\example\edit_distance.cpp"
>
Modified: sandbox/SOC/2007/signals/libs/dataflow/example/glv_gui/blueprint_window.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/glv_gui/blueprint_window.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/glv_gui/blueprint_window.cpp 2008-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -31,7 +31,8 @@
std::cout << "Adding component" << name << std::endl;
std::auto_ptr<blueprint::component> c(f());
- blueprint_component *bc = new blueprint_component(name, *c, m_network.add_component(c));
+ blueprint::component &cr = *c;
+ blueprint_component *bc = new blueprint_component(name, cr, m_network.add_component(c));
add_component_helper(*bc);
/* gui::wnd<blueprint_component> bc = gui::create<blueprint_component>
@@ -99,7 +100,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/glv_gui/glvgui_example.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/example/glv_gui/glvgui_example.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/example/glv_gui/glvgui_example.cpp 2008-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -67,9 +67,10 @@
// Output and input components
add_component<output_valuator>("out");
add_component<input_valuator>("in");
- // A filter that doubles
- add_component<signals::function<void (float), float(float)> >
- ("x2", boost::function<float(float)>(boost::bind(std::multiplies<float>(), _1, 2)));
+#ifndef BOOST_MSVC
+ add_component<signals::function<void (int), int(int)> >
+ ("x2", boost::function<int(int)>(boost::bind(std::multiplies<int>(), _1, 2)));
+#endif
}
};
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_lazy_sequence.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_lazy_sequence.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_lazy_sequence.cpp 2008-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -72,7 +72,7 @@
BOOST_CHECK_EQUAL(fusion::at_c<3>(index_shift), 4u);
- BOOST_CHECK_EQUAL(fusion::at_c<0>(fusion::make_lazy_sequence(one, boost::mpl::int_<1>())), 1);
+ BOOST_CHECK_EQUAL(fusion::at_c<0>(fusion::make_lazy_sequence(&one, boost::mpl::int_<1>())), 1);
return 0;
} // int test_main(int, char* [])
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_vector_same_initialization.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_vector_same_initialization.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_vector_same_initialization.cpp 2008-07-18 13:22:21 EDT (Fri, 18 Jul 2008)
@@ -10,16 +10,20 @@
#include <boost/test/included/test_exec_monitor.hpp>
+namespace test {
+
int one(int index)
{
return 1;
}
+}
+
int test_main(int, char* [])
{
using namespace boost::fusion;
- vector<int, float, double> ones(make_lazy_sequence(one, boost::mpl::int_<3>()));
+ vector<int, float, double> ones(make_lazy_sequence(&test::one, boost::mpl::int_<3>()));
BOOST_CHECK_EQUAL(at_c<0>(ones), 1);
BOOST_CHECK_EQUAL(at_c<1>(ones), 1.0f);