Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8562/src/libopenvrml/openvrml
Modified Files:
Tag: OpenVRML-0_16-BRANCH
vrml97node.cpp
Log Message:
Removed function-try-block; this still seems to confuse Microsoft cl 14.00.50727.42.
Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.108.2.1
retrieving revision 1.108.2.2
diff -C2 -d -r1.108.2.1 -r1.108.2.2
*** vrml97node.cpp 16 Aug 2006 19:28:16 -0000 1.108.2.1
--- vrml97node.cpp 17 Aug 2006 20:03:08 -0000 1.108.2.2
***************
*** 7449,7471 ****
openvrml::image & img)
OPENVRML_THROW1(std::bad_alloc)
! try {
! using openvrml::image;
! if (url.value().empty()) {
! img = image();
! } else {
! using std::auto_ptr;
! using openvrml::resource_istream;
! auto_ptr<resource_istream> in(
! node.scene()->get_resource(url.value()));
! auto_ptr<stream_listener> listener(
! new image_stream_listener(in->url(),
! img,
! node,
! node_mutex));
! read_stream(in, listener);
! }
! } catch (const openvrml::no_alternative_url & ex) {}
/**
--- 7449,7473 ----
openvrml::image & img)
OPENVRML_THROW1(std::bad_alloc)
! {
! try {
! using openvrml::image;
! if (url.value().empty()) {
! img = image();
! } else {
! using std::auto_ptr;
! using openvrml::resource_istream;
! auto_ptr<resource_istream> in(
! node.scene()->get_resource(url.value()));
! auto_ptr<stream_listener> listener(
! new image_stream_listener(in->url(),
! img,
! node,
! node_mutex));
! read_stream(in, listener);
! }
! } catch (const openvrml::no_alternative_url &) {}
! }
/**
|
