SF.net SVN: openvrml:[4101] trunk

[<br...@us...>]

Revision: 4101
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4101&view=rev
Author:   braden
Date:     2010-02-14 01:28:03 +0000 (Sun, 14 Feb 2010)

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

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tests/browser.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-13 23:49:46 UTC (rev 4100)
+++ trunk/ChangeLog	2010-02-14 01:28:03 UTC (rev 4101)
@@ -1,5 +1,10 @@
 2010-02-13 Braden McDaniel  <br...@en...>
 
+	* tests/browser.cpp: Modernize Boost.Thread usage: include
+	<boost/thread.hpp> and use boost::condition_variable.
+
+2010-02-13 Braden McDaniel  <br...@en...>
+
 	* ide-projects/Windows/VisualC9_0/OpenVRML/vrml97/vrml97.vcproj:
 	Update FreeType library name for 2.3.12.
 

Modified: trunk/tests/browser.cpp
===================================================================
--- trunk/tests/browser.cpp	2010-02-13 23:49:46 UTC (rev 4100)
+++ trunk/tests/browser.cpp	2010-02-14 01:28:03 UTC (rev 4101)
@@ -24,7 +24,7 @@
 # include <sstream>
 # include <boost/filesystem/operations.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
-# include <boost/thread/condition.hpp>
+# include <boost/thread.hpp>
 # include <boost/test/unit_test.hpp>
 # include "test_resource_fetcher.h"
 
@@ -80,10 +80,11 @@
     class children_listener : public openvrml::mfnode_listener {
         bool received_event_;
         boost::mutex & mutex_;
-        boost::condition & condition_;
+        boost::condition_variable & condition_;
 
     public:
-        children_listener(boost::mutex & mutex, boost::condition & condition):
+        children_listener(boost::mutex & mutex,
+                          boost::condition_variable & condition):
             received_event_(false),
             mutex_(mutex),
             condition_(condition)
@@ -122,7 +123,7 @@
         b.create_vrml_from_stream(vrmlstream);
 
     boost::mutex mutex;
-    boost::condition listener_received_event;
+    boost::condition_variable listener_received_event;
 
     children_listener listener(mutex, listener_received_event);
     mfnode_emitter & emitter =


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