Subject: [Boost-commit] svn:boost r85097 - in branches/release: boost/signals2 boost/signals2/detail libs/signals2 libs/signals2/example
From: fmhess_at_[hidden]
Date: 2013-07-21 00:23:20
Author: fmhess
Date: 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013)
New Revision: 85097
URL: http://svn.boost.org/trac/boost/changeset/85097
Log:
Merge from trunk.
Properties modified:
branches/release/boost/signals2/ (props changed)
branches/release/libs/signals2/ (props changed)
Text files modified:
branches/release/boost/signals2/detail/signal_template.hpp | 2 +-
branches/release/boost/signals2/signal.hpp | 2 +-
branches/release/libs/signals2/example/custom_combiners.cpp | 2 +-
branches/release/libs/signals2/example/disconnect_and_block.cpp | 2 +-
branches/release/libs/signals2/example/extended_slot.cpp | 3 ++-
branches/release/libs/signals2/example/hello_world_multi_slot.cpp | 3 ++-
branches/release/libs/signals2/example/hello_world_slot.cpp | 3 ++-
branches/release/libs/signals2/example/ordering_slots.cpp | 3 ++-
branches/release/libs/signals2/example/signal_return_value.cpp | 3 ++-
branches/release/libs/signals2/example/slot_arguments.cpp | 3 ++-
10 files changed, 16 insertions(+), 10 deletions(-)
Modified: branches/release/boost/signals2/detail/signal_template.hpp
==============================================================================
--- branches/release/boost/signals2/detail/signal_template.hpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/boost/signals2/detail/signal_template.hpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -737,7 +737,7 @@
BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS) <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> &sig2 )
{
sig1.swap(sig2);
- };
+ }
#endif
namespace detail
Modified: branches/release/boost/signals2/signal.hpp
==============================================================================
--- branches/release/boost/signals2/signal.hpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/boost/signals2/signal.hpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -55,7 +55,7 @@
signal<Signature, Combiner, Group, GroupCompare, SlotFunction, ExtendedSlotFunction, Mutex> &sig2)
{
sig1.swap(sig2);
- };
+ }
}
}
Modified: branches/release/libs/signals2/example/custom_combiners.cpp
==============================================================================
--- branches/release/libs/signals2/example/custom_combiners.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/custom_combiners.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -106,4 +106,4 @@
{
maximum_combiner_example();
aggregate_values_example();
-};
+}
Modified: branches/release/libs/signals2/example/disconnect_and_block.cpp
==============================================================================
--- branches/release/libs/signals2/example/disconnect_and_block.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/disconnect_and_block.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -111,4 +111,4 @@
disconnect_by_slot_example();
return 0;
-};
+}
Modified: branches/release/libs/signals2/example/extended_slot.cpp
==============================================================================
--- branches/release/libs/signals2/example/extended_slot.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/extended_slot.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -38,4 +38,5 @@
sig(); // prints nothing, world slot has disconnected itself
return 0;
-};
+}
+
Modified: branches/release/libs/signals2/example/hello_world_multi_slot.cpp
==============================================================================
--- branches/release/libs/signals2/example/hello_world_multi_slot.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/hello_world_multi_slot.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -43,4 +43,5 @@
//]
return 0;
-};
+}
+
Modified: branches/release/libs/signals2/example/hello_world_slot.cpp
==============================================================================
--- branches/release/libs/signals2/example/hello_world_slot.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/hello_world_slot.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -36,4 +36,5 @@
//]
return 0;
-};
+}
+
Modified: branches/release/libs/signals2/example/ordering_slots.cpp
==============================================================================
--- branches/release/libs/signals2/example/ordering_slots.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/ordering_slots.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -58,4 +58,5 @@
//]
return 0;
-};
+}
+
Modified: branches/release/libs/signals2/example/signal_return_value.cpp
==============================================================================
--- branches/release/libs/signals2/example/signal_return_value.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/signal_return_value.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -34,4 +34,5 @@
// difference function.
std::cout << *sig(5, 3) << std::endl;
//]
-};
+}
+
Modified: branches/release/libs/signals2/example/slot_arguments.cpp
==============================================================================
--- branches/release/libs/signals2/example/slot_arguments.cpp Sat Jul 20 16:29:39 2013 (r85096)
+++ branches/release/libs/signals2/example/slot_arguments.cpp 2013-07-21 00:23:19 EDT (Sun, 21 Jul 2013) (r85097)
@@ -53,4 +53,5 @@
sig(5., 3.);
//]
return 0;
-};
+}
+