From: Braden M. <br...@us...> - 2006-05-08 17:08:19
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29916/src/libopenvrml/openvrml Modified Files: browser.cpp browser.h Log Message: Changed exception specification of openvrml::browser::load_url to throw boost::thread_resource_error. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.172 retrieving revision 1.173 diff -C2 -d -r1.172 -r1.173 *** browser.cpp 22 Apr 2006 03:34:15 -0000 1.172 --- browser.cpp 8 May 2006 08:34:16 -0000 1.173 *************** *** 6630,6634 **** struct OPENVRML_LOCAL openvrml::browser::root_scene_loader { ! root_scene_loader(browser & b, const std::vector<std::string> & url): browser_(&b), url_(&url) --- 6630,6635 ---- struct OPENVRML_LOCAL openvrml::browser::root_scene_loader { ! root_scene_loader(browser & b, const std::vector<std::string> & url) ! OPENVRML_NOTHROW: browser_(&b), url_(&url) *************** *** 6672,6680 **** * @param[in] parameter parameters for @p url. * ! * @exception std::bad_alloc if memory allocation fails. */ void openvrml::browser::load_url(const std::vector<std::string> & url, const std::vector<std::string> &) ! OPENVRML_THROW1(std::bad_alloc) { boost::function0<void> f = root_scene_loader(*this, url); --- 6673,6682 ---- * @param[in] parameter parameters for @p url. * ! * @exception std::bad_alloc if memory allocation fails. ! * @exception boost::thread_resource_error if thread creation fails. */ void openvrml::browser::load_url(const std::vector<std::string> & url, const std::vector<std::string> &) ! OPENVRML_THROW1(boost::thread_resource_error) { boost::function0<void> f = root_scene_loader(*this, url); Index: browser.h =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.h,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** browser.h 17 Apr 2006 07:29:17 -0000 1.56 --- browser.h 8 May 2006 08:34:16 -0000 1.57 *************** *** 292,296 **** void load_url(const std::vector<std::string> & url, const std::vector<std::string> & parameter) ! OPENVRML_THROW1(std::bad_alloc); virtual void description(const std::string & description); const std::vector<boost::intrusive_ptr<node> > --- 292,296 ---- void load_url(const std::vector<std::string> & url, const std::vector<std::string> & parameter) ! OPENVRML_THROW1(boost::thread_resource_error); virtual void description(const std::string & description); const std::vector<boost::intrusive_ptr<node> > |