SF.net SVN: openvrml:[4079] trunk

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

Revision: 4079
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4079&view=rev
Author:   braden
Date:     2010-02-06 04:21:57 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
Terminating a variable argument list with plain 0 is not 64-bit-safe.  Use static_cast<void *>(0) instead.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-xembed/main.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-06 03:52:48 UTC (rev 4078)
+++ trunk/ChangeLog	2010-02-06 04:21:57 UTC (rev 4079)
@@ -1,5 +1,12 @@
 2010-02-05 Braden McDaniel  <br...@en...>
 
+	* src/openvrml-xembed/main.cpp
+	(dbus_thread_loop::operator()() const): Terminating a variable
+	argument list with plain 0 is not 64-bit-safe.
+	Use static_cast<void *>(0) instead.
+
+2010-02-05 Braden McDaniel  <br...@en...>
+
 	* src/local/libopenvrml-control/openvrml_control/browser.cpp
 	(openvrml_control::browser::resource_fetcher::do_get_resource(const
 	std::string &)): Ensure that plugin_streambuf::set_get_url_result

Modified: trunk/src/openvrml-xembed/main.cpp
===================================================================
--- trunk/src/openvrml-xembed/main.cpp	2010-02-06 03:52:48 UTC (rev 4078)
+++ trunk/src/openvrml-xembed/main.cpp	2010-02-06 04:21:57 UTC (rev 4079)
@@ -2,7 +2,7 @@
 //
 // OpenVRML XEmbed Control
 //
-// Copyright 2004, 2005, 2006, 2007, 2008  Braden McDaniel
+// Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010  Braden McDaniel
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
@@ -46,10 +46,10 @@
 G_GNUC_INTERNAL
 gboolean
 openvrml_xembed_name_owner_changed(DBusGProxy * proxy,
-                                                   const gchar * name,
-                                                   const gchar * old_owner,
-                                                   const gchar * new_owner,
-                                                   gpointer user_data);
+                                   const gchar * name,
+                                   const gchar * old_owner,
+                                   const gchar * new_owner,
+                                   gpointer user_data);
 
 namespace {
 
@@ -108,7 +108,7 @@
                         OPENVRML_XEMBED_TYPE_BROWSER_FACTORY,
                         "connection", connection,
                         "main-thread-context", &this->main_thread_context_,
-                        0));
+                        static_cast<void *>(0)));
             scope_guard browser_factory_guard =
                 make_guard(g_object_unref, browser_factory);
             boost::ignore_unused_variable_warning(browser_factory_guard);


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