[openvrml-commit] openvrml/src/openvrml-xembed bounded_buffer.h, 1.5, 1.6 command_istream.cpp, 1.3, 1.4 gtkvrmlbrowser.cpp, 1.4, 1.5 main.cpp, 1.5, 1.6 plugin_streambuf.cpp, 1.3, 1.4

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14672/src/openvrml-xembed

Modified Files:
	bounded_buffer.h command_istream.cpp gtkvrmlbrowser.cpp 
	main.cpp plugin_streambuf.cpp 
Log Message:
Prefer GLib's g_assert to assert everywhere except bounded_buffer.

Index: plugin_streambuf.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plugin_streambuf.cpp	12 Feb 2007 02:19:30 -0000	1.3
--- plugin_streambuf.cpp	15 Mar 2007 22:41:57 -0000	1.4
***************
*** 44,48 ****
  {
      boost::mutex::scoped_lock lock(this->mutex_);
!     assert(this->get_url_result_ == -1);
      this->get_url_result_ = result;
      this->received_get_url_result_.notify_all();
--- 44,48 ----
  {
      boost::mutex::scoped_lock lock(this->mutex_);
!     g_assert(this->get_url_result_ == -1);
      this->get_url_result_ = result;
      this->received_get_url_result_.notify_all();

Index: bounded_buffer.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/bounded_buffer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** bounded_buffer.h	12 Feb 2007 02:19:30 -0000	1.5
--- bounded_buffer.h	15 Mar 2007 22:41:57 -0000	1.6
***************
*** 22,25 ****
--- 22,26 ----
  #   define OPENVRML_XEMBED_BOUNDED_BUFFER_H
  
+ #   include <cassert>
  #   include <string>
  #   include <boost/thread/mutex.hpp>

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** main.cpp	12 Feb 2007 02:19:30 -0000	1.5
--- main.cpp	15 Mar 2007 22:41:57 -0000	1.6
***************
*** 85,89 ****
                      shared_ptr<plugin_streambuf> streambuf =
                          uninitialized_plugin_streambuf_map_.find(url);
!                     assert(streambuf);
                      streambuf->set_get_url_result(result);
                  } else if (command == "new-stream") {
--- 85,89 ----
                      shared_ptr<plugin_streambuf> streambuf =
                          uninitialized_plugin_streambuf_map_.find(url);
!                     g_assert(streambuf);
                      streambuf->set_get_url_result(result);
                  } else if (command == "new-stream") {

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/gtkvrmlbrowser.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtkvrmlbrowser.cpp	12 Feb 2007 02:19:30 -0000	1.4
--- gtkvrmlbrowser.cpp	15 Mar 2007 22:41:57 -0000	1.5
***************
*** 516,520 ****
  gint gtk_vrml_browser_timeout_callback(const gpointer ptr)
  {
!     assert(ptr);
  
      GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(ptr);
--- 516,520 ----
  gint gtk_vrml_browser_timeout_callback(const gpointer ptr)
  {
!     g_assert(ptr);
  
      GtkGLViewer & viewer = *static_cast<GtkGLViewer *>(ptr);

Index: command_istream.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/command_istream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** command_istream.cpp	12 Feb 2007 02:19:30 -0000	1.3
--- command_istream.cpp	15 Mar 2007 22:41:57 -0000	1.4
***************
*** 19,23 ****
  //
  
- # include <cassert>
  # include <cerrno>
  # include "command_istream.h"
--- 19,22 ----