From: Peter Kümmel <syntheticpp@gmx.net>
Date: Sun, 7 Mar 2010 11:03:23 +0000 (+0000)
Subject: cmake: fix merge build
X-Git-Tag: 2.0.0~3879
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3a5d681a9b573ffa4a3c84f55ad6e6eabd2ed488;p=features.git

cmake: fix merge build

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33660 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/tex2lyx/boost.cpp b/src/tex2lyx/boost.cpp
index f37f235d8e..f1dad3061b 100644
--- a/src/tex2lyx/boost.cpp
+++ b/src/tex2lyx/boost.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 namespace boost {
 
-void throw_exception(exception const & e)
+void throw_exception(std::exception const & e)
 {
 	lyx::lyxerr << "Exception caught:\n"
 	       << e.what() << endl;