rpms/openvrml/F-9 gcc43-std.patch,NONE,1.1 openvrml.spec,1.40,1.41

[Braden McDaniel (braden)]

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16278/F-9

Modified Files:
	openvrml.spec 
Added Files:
	gcc43-std.patch 
Log Message:
Patch to fix missing std qualification that gcc 4.3 complains about.

gcc43-std.patch:

--- NEW FILE gcc43-std.patch ---
Index: src/libopenvrml/openvrml/browser.cpp
===================================================================
--- src/libopenvrml/openvrml/browser.cpp	(revision 3425)
+++ src/libopenvrml/openvrml/browser.cpp	(working copy)
@@ -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;
 
         //
Index: src/libopenvrml/openvrml/script.cpp
===================================================================
--- src/libopenvrml/openvrml/script.cpp	(revision 3425)
+++ src/libopenvrml/openvrml/script.cpp	(working copy)
@@ -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);


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-9/openvrml.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openvrml.spec	26 Mar 2008 20:24:52 -0000	1.40
+++ openvrml.spec	22 Apr 2008 16:05:17 -0000	1.41
@@ -1,12 +1,13 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.17.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
 Source:         http://downloads.sf.net/openvrml/%{name}-%{version}.tar.gz
-Patch:          437611.patch
+Patch0:         437611.patch
+Patch1:         gcc43-std.patch
 URL:            http://openvrml.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  pkgconfig >= 0.12.0
@@ -94,7 +95,8 @@
 
 %prep
 %setup
-%patch -p0
+%patch0 -p0
+%patch1 -p0
 
 %build
 %configure --disable-static --disable-exception-specs --disable-examples --disable-script-node-java CPPFLAGS="-DNDEBUG" BOOST_LIB_SUFFIX="-mt"
@@ -171,6 +173,9 @@
 
 
 %changelog
+* Tue Apr 22 2008  Braden McDaniel  <braden at endoframe.com> - 0.17.5-4
+- Patch to fix missing std qualification that gcc 4.3 complains about.
+
 * Wed Mar 26 2008  Braden McDaniel  <braden at endoframe.com> - 0.17.5-3
 - Fixed patch to use -p0.