SF.net SVN: openvrml:[4003] trunk

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

Revision: 4003
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4003&view=rev
Author:   braden
Date:     2009-10-19 07:07:50 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
Fixes for building against Boost 1.40.0.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/libopenvrml/openvrml/browser.cpp
    trunk/src/libopenvrml/openvrml/local/externproto.cpp
    trunk/src/libopenvrml/openvrml/local/uri.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/local/libopenvrml-control/openvrml_control/browser.h
    trunk/src/node/vrml97/inline.cpp
    trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
    trunk/src/openvrml-xembed/main.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/ChangeLog	2009-10-19 07:07:50 UTC (rev 4003)
@@ -1,5 +1,25 @@
+2009-10-19 Braden McDaniel  <br...@en...>
+
+	Fixes for building against Boost 1.40.0.
+
+	* src/libopenvrml/openvrml/browser.cpp
+	* src/libopenvrml/openvrml/local/uri.cpp
+	* src/libopenvrml/openvrml/local/externproto.cpp
+	* src/libopenvrml/openvrml/scene.cpp
+	* src/local/libopenvrml-control/openvrml_control/browser.h
+	* src/node/vrml97/inline.cpp
+	* src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
+	* src/openvrml-xembed/main.cpp
+
 2009-10-18 Braden McDaniel  <br...@en...>
 
+	* src/openvrml-xembed/main.cpp
+	(openvrml_xembed_name_owner_changed(DBusGProxy *, const gchar *,
+	const gchar *, const gchar *, gpointer)): Only print out debugging
+	message if we actually erased any references.
+
+2009-10-18 Braden McDaniel  <br...@en...>
+
 	Make throw_runtime_error_from_win32_system_error available to
 	other translation units.
 

Modified: trunk/src/libopenvrml/openvrml/browser.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/browser.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/browser.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -29,6 +29,7 @@
 # include <openvrml/local/parse_vrml.h>
 # include <private.h>
 # include <boost/bind.hpp>
+# include <boost/function.hpp>
 # include <boost/functional.hpp>
 # include <boost/lexical_cast.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>

Modified: trunk/src/libopenvrml/openvrml/local/externproto.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/externproto.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/local/externproto.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -23,6 +23,7 @@
 # include "uri.h"
 # include <openvrml/browser.h>
 # include <openvrml/scene.h>
+# include <boost/function.hpp>
 # include <boost/mpl/for_each.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
 

Modified: trunk/src/libopenvrml/openvrml/local/uri.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/uri.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/local/uri.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -21,6 +21,7 @@
 # include "uri.h"
 # include <list>
 # include <cerrno>
+# include <cstring>
 # ifdef _WIN32
 #   include <boost/multi_index/detail/scope_guard.hpp>
 using namespace boost::multi_index::detail;  // for scope_guard
@@ -596,7 +597,7 @@
         assert(errno != 0);
         assert(errno != EFAULT);
         assert(errno != EINVAL);
-        throw std::runtime_error(strerror(errno));
+        throw std::runtime_error(std::strerror(errno));
     }
 # endif
     return std::string(&buf.front());

Modified: trunk/src/libopenvrml/openvrml/scene.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/scene.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/libopenvrml/openvrml/scene.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -24,6 +24,7 @@
 # include <openvrml/local/uri.h>
 # include <openvrml/local/parse_vrml.h>
 # include <private.h>
+# include <boost/function.hpp>
 
 # ifdef HAVE_CONFIG_H
 #   include <config.h>

Modified: trunk/src/local/libopenvrml-control/openvrml_control/browser.h
===================================================================
--- trunk/src/local/libopenvrml-control/openvrml_control/browser.h	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/local/libopenvrml-control/openvrml_control/browser.h	2009-10-19 07:07:50 UTC (rev 4003)
@@ -22,6 +22,7 @@
 #   define OPENVRML_CONTROL_BROWSER_H
 
 #   include <openvrml/browser.h>
+#   include <boost/function.hpp>
 
 namespace openvrml_control {
 

Modified: trunk/src/node/vrml97/inline.cpp
===================================================================
--- trunk/src/node/vrml97/inline.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/node/vrml97/inline.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -29,6 +29,7 @@
 # include <openvrml/scene.h>
 # include <private.h>
 # include <boost/array.hpp>
+# include <boost/function.hpp>
 
 namespace {
 

Modified: trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp
===================================================================
--- trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -274,7 +274,8 @@
     {
         if ((this->control_point_.value()
              && this->control_point_.value()->modified())
-            || this->tex_coord_.value() && this->tex_coord_.value()->modified())
+            || (this->tex_coord_.value()
+                && this->tex_coord_.value()->modified()))
         {
             return true;
         }

Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp	2009-10-19 04:16:53 UTC (rev 4002)
+++ trunk/src/openvrml-xembed/main.cpp	2009-10-19 07:07:50 UTC (rev 4003)
@@ -26,6 +26,7 @@
 # include <dbus/dbus-glib-bindings.h>
 # include <dbus/dbus-glib-lowlevel.h>
 # include <boost/concept_check.hpp>
+# include <boost/function.hpp>
 # include <boost/lexical_cast.hpp>
 # include <boost/multi_index/detail/scope_guard.hpp>
 # include <boost/ref.hpp>


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