From 1f91982766fbc727461e0a2dd64c95356cc32170 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Mon, 10 Jun 2002 18:08:12 +0000 Subject: [PATCH] make it compile without exceptions on gcc 2.96 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4357 a592a061-630c-0410-9148-cb99ea01b6c8 --- boost/boost/config/user.hpp | 6 +++--- boost/boost/detail/shared_count.hpp | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/boost/boost/config/user.hpp b/boost/boost/config/user.hpp index 507117f783..6cada00978 100644 --- a/boost/boost/config/user.hpp +++ b/boost/boost/config/user.hpp @@ -75,10 +75,10 @@ // If there are no exceptions then we must report critical-errors // the only way we know how; by terminating. // -#ifdef __BORLANDC__ +//#ifdef __BORLANDC__ // seems not to make stderr usable with Borland: -#include -#endif +#include +//#endif # define BOOST_NOEH_ASSERT(x)\ if(0 == (x))\ {\ diff --git a/boost/boost/detail/shared_count.hpp b/boost/boost/detail/shared_count.hpp index b937ce0e11..918d647451 100644 --- a/boost/boost/detail/shared_count.hpp +++ b/boost/boost/detail/shared_count.hpp @@ -233,18 +233,23 @@ public: template shared_count(P p, D d, void const * = 0): pi_(0) { +#ifndef BOOST_NO_EXCEPTIONS try { +#endif pi_ = new counted_base_impl(p, d, 1, 1); +#ifndef BOOST_NO_EXCEPTIONS } +#endif +#ifndef BOOST_NO_EXCEPTIONS catch(...) + { d(p); // delete p -#ifndef BOOST_NO_EXCEPTIONS throw; -#endif - BOOST_NOEH_ASSERT(false); } +#endif + BOOST_NOEH_ASSERT(pi_); } template shared_count(P, D, counted_base * pi): pi_(pi) -- 2.39.2