[Boost-commit] svn:boost r60427 - in branches/release/libs/signals2: . example

Subject: [Boost-commit] svn:boost r60427 - in branches/release/libs/signals2: . example
From: fmhess_at_[hidden]
Date: 2010-03-10 11:02:52

Author: fmhess
Date: 2010-03-10 11:02:51 EST (Wed, 10 Mar 2010)
New Revision: 60427
URL: http://svn.boost.org/trac/boost/changeset/60427

Log:
Merged [60416] from trunk to release.

Added:
   branches/release/libs/signals2/example/Jamfile.v2
      - copied unchanged from r60416, /trunk/libs/signals2/example/Jamfile.v2
Properties modified: 
   branches/release/libs/signals2/   (props changed)
Text files modified: 
   branches/release/libs/signals2/example/disconnect_and_block.cpp |     1 +                                       
   branches/release/libs/signals2/example/doc_view_acm.cpp         |     4 ++--                                    
   2 files changed, 3 insertions(+), 2 deletions(-)

Modified: branches/release/libs/signals2/example/disconnect_and_block.cpp
==============================================================================
--- branches/release/libs/signals2/example/disconnect_and_block.cpp	(original)
+++ branches/release/libs/signals2/example/disconnect_and_block.cpp	2010-03-10 11:02:51 EST (Wed, 10 Mar 2010)
@@ -10,6 +10,7 @@
 
 #include <iostream>
 #include <boost/signals2/signal.hpp>
+#include <boost/signals2/shared_connection_block.hpp>
 
 struct HelloWorld
 {

Modified: branches/release/libs/signals2/example/doc_view_acm.cpp
==============================================================================
--- branches/release/libs/signals2/example/doc_view_acm.cpp	(original)
+++ branches/release/libs/signals2/example/doc_view_acm.cpp	2010-03-10 11:02:51 EST (Wed, 10 Mar 2010)
@@ -23,7 +23,7 @@
   typedef boost::signals2::signal<void ()>  signal_t;
 
 public:
-  document()
+  Document()
   {}
 
   /* connect a slot to the signal which will be emitted whenever
@@ -39,7 +39,7 @@
     m_sig();
   }
 
-  const std::string& gettext() const
+  const std::string& getText() const
   {
     return m_text;
   }