SF.net SVN: openvrml: [3463] branches/0.17

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

Revision: 3463
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3463&view=rev
Author:   braden
Date:     2008-04-26 08:52:31 -0700 (Sat, 26 Apr 2008)

Log Message:
-----------
Qualification fixes to satisfy gcc 4.3 pickiness.

Modified Paths:
--------------
    branches/0.17/ChangeLog
    branches/0.17/src/libopenvrml/openvrml/browser.cpp
    branches/0.17/src/libopenvrml/openvrml/script.cpp

Modified: branches/0.17/ChangeLog
===================================================================
--- branches/0.17/ChangeLog	2008-04-26 05:28:12 UTC (rev 3462)
+++ branches/0.17/ChangeLog	2008-04-26 15:52:31 UTC (rev 3463)
@@ -1,3 +1,22 @@
+2007-04-26 Braden McDaniel  <br...@en...>
+
+	Qualification fixes to satisfy gcc 4.3 pickiness.
+
+	* src/libopenvrml/openvrml/browser.cpp
+	(openvrml::browser::node_metatype_map::init(viewpoint_node *,
+	double)): Qualify std::for_each.
+	(openvrml::browser::node_metatype_map::render(openvrml::viewer&)):
+	Qualify std::for_each.
+	(openvrml::browser::node_metatype_map::shutdown(double)): Qualify
+	std::for_each.
+	(openvrml::browser::set_world(resource_istream &)): Import
+	std::for_each into the function's outermost scope.
+	* src/libopenvrml/openvrml/script.cpp
+	(eventOut_setProperty(JSContext *, JSObject *, jsval, jsval *)):
+	Import std::find_if.
+	(script::field_setProperty(JSContext *, JSObject *, jsval,
+	jsval *)): Import std::find_if.
+
 2007-04-08 Braden McDaniel  <br...@en...>
 
 	Fixed a potential crash during creation of the Gtk widget.

Modified: branches/0.17/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- branches/0.17/src/libopenvrml/openvrml/browser.cpp	2008-04-26 05:28:12 UTC (rev 3462)
+++ branches/0.17/src/libopenvrml/openvrml/browser.cpp	2008-04-26 15:52:31 UTC (rev 3463)
@@ -6917,8 +6917,8 @@
                                            const double timestamp)
 {
     read_write_mutex::scoped_read_lock lock(this->mutex_);
-    for_each(this->map_.begin(), this->map_.end(),
-             init_node_metatype(initial_viewpoint, timestamp));
+    std::for_each(this->map_.begin(), this->map_.end(),
+                  init_node_metatype(initial_viewpoint, timestamp));
 }
 
 /**
@@ -7023,7 +7023,8 @@
 void openvrml::browser::node_metatype_map::render(openvrml::viewer & v)
 {
     read_write_mutex::scoped_read_lock lock(this->mutex_);
-    for_each(this->map_.begin(), this->map_.end(), render_node_metatype(v));
+    std::for_each(this->map_.begin(), this->map_.end(),
+                  render_node_metatype(v));
 }
 
 namespace {
@@ -7054,8 +7055,8 @@
     OPENVRML_NOTHROW
 {
     read_write_mutex::scoped_read_lock lock(this->mutex_);
-    for_each(this->map_.begin(), this->map_.end(),
-             shutdown_node_metatype(timestamp));
+    std::for_each(this->map_.begin(), this->map_.end(),
+                  shutdown_node_metatype(timestamp));
 }
 
 /**
@@ -7843,10 +7844,10 @@
  */
 void openvrml::browser::set_world(resource_istream & in)
 {
+    using std::for_each;
     {
         read_write_mutex::scoped_read_write_lock scene_lock(this->scene_mutex_);
 
-        using std::for_each;
         using std::string;
 
         //

Modified: branches/0.17/src/libopenvrml/openvrml/script.cpp
===================================================================
--- branches/0.17/src/libopenvrml/openvrml/script.cpp	2008-04-26 05:28:12 UTC (rev 3462)
+++ branches/0.17/src/libopenvrml/openvrml/script.cpp	2008-04-26 15:52:31 UTC (rev 3463)
@@ -3643,6 +3643,8 @@
                             jsval * const val)
     OPENVRML_NOTHROW
 {
+    using std::find_if;
+
     JSString * const str = JS_ValueToString(cx, id);
     if (!str) { return JS_FALSE; }
     const char * const eventId = JS_GetStringBytes(str);
@@ -3697,6 +3699,8 @@
                                  jsval * const val)
     OPENVRML_NOTHROW
 {
+    using std::find_if;
+
     JSString * const str = JS_ValueToString(cx, id);
     if (!str) { return JS_FALSE; }
     const char * const fieldId = JS_GetStringBytes(str);


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