From 7231275a0975604bd8b8107e52628153f8618a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Fri, 3 Oct 2008 12:51:20 +0000
Subject: [PATCH] fix merge build: this is a std::exception

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26693 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/boost.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boost.cpp b/src/boost.cpp
index f195cdf4e9..044d20a922 100644
--- a/src/boost.cpp
+++ b/src/boost.cpp
@@ -26,7 +26,7 @@ using lyx::lyxerr;
 namespace boost {
 
 #ifndef BOOST_NO_EXCEPTIONS
-void throw_exception(exception const & e)
+void throw_exception(std::exception const & e)
 {
 	lyxerr << "Exception caught:\n" << e.what() << endl;
 	LASSERT(false, /**/);