SF.net SVN: openvrml:[4091] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4091
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4091&view=rev
Author:   braden
Date:     2010-02-08 04:42:11 +0000 (Mon, 08 Feb 2010)

Log Message:
-----------
Modernize Boost.Thread usage: include <boost/thread.hpp> and use boost::condition_variable.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/Makefile.am
    trunk/src/libopenvrml/openvrml/browser.cpp
    trunk/src/libopenvrml/openvrml/field_value.h
    trunk/src/libopenvrml/openvrml/local/externproto.h
    trunk/src/libopenvrml/openvrml/node.h
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp
    trunk/src/openvrml-xembed/main.cpp

Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/ChangeLog	2010-02-08 04:42:11 UTC (rev 4091)
@@ -1,3 +1,24 @@
+2010-02-07 Braden McDaniel  <br...@en...>
+
+	Modernize Boost.Thread usage: include <boost/thread.hpp> and use
+	boost::condition_variable.
+
+	* src/Makefile.am
+	(local_libopenvrml_control_la_LDFLAGS): Link with libboost_thread.
+	* src/libopenvrml/openvrml/browser.cpp: Boost.Thread headers are
+	pulled in by scene.h.
+	* src/libopenvrml/openvrml/field_value.h: Include
+	<boost/thread.hpp>.
+	* src/libopenvrml/openvrml/local/externproto.h: Include
+	<boost/thread.hpp>.
+	* src/libopenvrml/openvrml/node.h: Boost.Thread headers are pulled
+	in by field_value.h.
+	* src/libopenvrml/openvrml/scene.h: Boost.Thread headers are
+	pulled in by node.h.
+	* src/local/libopenvrml-control/openvrml_control/browser.cpp:
+	Include <boost/thread.hpp>; use boost::condition_variable.
+	* src/openvrml-xembed/main.cpp: Include <boost/thread.hpp>.
+
 2010-02-06 Braden McDaniel  <br...@en...>
 
 	Remove Java-related function definitions.  The signatures of these

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/Makefile.am	2010-02-08 04:42:11 UTC (rev 4091)
@@ -746,6 +746,8 @@
 local_libopenvrml_control_la_CPPFLAGS = \
         -I$(top_builddir)/src/libopenvrml \
         -I$(top_srcdir)/src/libopenvrml
+local_libopenvrml_control_la_LDFLAGS = \
+        -lboost_thread$(BOOST_LIB_SUFFIX)
 local_libopenvrml_control_la_LIBADD = \
         libopenvrml/libopenvrml.la
 

Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/browser.cpp	2010-02-08 04:42:11 UTC (rev 4091)
@@ -33,7 +33,6 @@
 # include <boost/functional.hpp>
 # include <boost/lexical_cast.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
-# include <boost/thread/thread.hpp>
 # include <algorithm>
 # include <functional>
 # include <cerrno>

Modified: trunk/src/libopenvrml/openvrml/field_value.h
===================================================================
--- trunk/src/libopenvrml/openvrml/field_value.h	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/field_value.h	2010-02-08 04:42:11 UTC (rev 4091)
@@ -31,8 +31,7 @@
 #   include <boost/scoped_ptr.hpp>
 #   include <boost/shared_ptr.hpp>
 #   include <boost/utility.hpp>
-#   include <boost/thread/locks.hpp>
-#   include <boost/thread/shared_mutex.hpp>
+#   include <boost/thread.hpp>
 #   include <openvrml/basetypes.h>
 
 namespace openvrml {

Modified: trunk/src/libopenvrml/openvrml/local/externproto.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/externproto.h	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/local/externproto.h	2010-02-08 04:42:11 UTC (rev 4091)
@@ -23,7 +23,7 @@
 
 #   include <openvrml/local/proto.h>
 #   include <boost/enable_shared_from_this.hpp>
-#   include <boost/thread/thread.hpp>
+#   include <boost/thread.hpp>
 
 namespace openvrml {
 

Modified: trunk/src/libopenvrml/openvrml/node.h
===================================================================
--- trunk/src/libopenvrml/openvrml/node.h	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/node.h	2010-02-08 04:42:11 UTC (rev 4091)
@@ -25,7 +25,6 @@
 #   include <openvrml/field_value.h>
 #   include <openvrml/rendering_context.h>
 #   include <boost/bind.hpp>
-#   include <boost/thread/mutex.hpp>
 #   include <deque>
 #   include <map>
 #   include <set>

Modified: trunk/src/libopenvrml/openvrml/scene.h
===================================================================
--- trunk/src/libopenvrml/openvrml/scene.h	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/libopenvrml/openvrml/scene.h	2010-02-08 04:42:11 UTC (rev 4091)
@@ -25,7 +25,6 @@
 #   include <openvrml-common.h>
 #   include <openvrml/bad_url.h>
 #   include <openvrml/node.h>
-#   include <boost/thread.hpp>
 
 namespace openvrml {
 

Modified: trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp
===================================================================
--- trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/local/libopenvrml-control/openvrml_control/browser.cpp	2010-02-08 04:42:11 UTC (rev 4091)
@@ -21,7 +21,7 @@
 # include "browser.h"
 # include <boost/enable_shared_from_this.hpp>
 # include <boost/lexical_cast.hpp>
-# include <boost/thread/condition.hpp>
+# include <boost/thread.hpp>
 # include <iostream>
 
 openvrml_control::unknown_stream::unknown_stream(const std::string & uri):
@@ -84,7 +84,7 @@
     template <typename CharT, size_t BufferSize>
     class bounded_buffer {
         mutable boost::mutex mutex_;
-        boost::condition buffer_not_full_, buffer_not_empty_or_eof_;
+        boost::condition_variable buffer_not_full_, buffer_not_empty_or_eof_;
 
         CharT buf_[BufferSize];
         size_t begin_, end_, buffered_;
@@ -184,8 +184,8 @@
     state_id state_;
     mutable boost::mutex mutex_;
     int get_url_result_;
-    mutable boost::condition received_get_url_result_;
-    mutable boost::condition streambuf_initialized_or_failed_;
+    mutable boost::condition_variable received_get_url_result_;
+    mutable boost::condition_variable streambuf_initialized_or_failed_;
     std::string url_;
     std::string type_;
     bounded_buffer<char_type, 16384> buf_;

Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp	2010-02-06 06:29:11 UTC (rev 4090)
+++ trunk/src/openvrml-xembed/main.cpp	2010-02-08 04:42:11 UTC (rev 4091)
@@ -31,7 +31,7 @@
 # include <boost/multi_index/detail/scope_guard.hpp>
 # include <boost/ref.hpp>
 # include <boost/scoped_ptr.hpp>
-# include <boost/thread/thread.hpp>
+# include <boost/thread.hpp>
 # include <iostream>
 # include <cstring>
 # include <unistd.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


