From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Thu, 6 Jan 2005 16:07:02 +0000 (+0000)
Subject: fix compilation with gcc 4.0
X-Git-Tag: 1.6.10~14685
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e3c9bdd0ea4e88e59a95d6a72417af659c01ff2e;p=features.git

fix compilation with gcc 4.0


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

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 4ae1a471bb..6702a9af8b 100644
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -784,13 +784,13 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 		recordUndo(cur, Undo::ATOMIC);
 		interpret(cur, '\\');
 		break;
-		
+
 	case LFUN_SUBSCRIPT:
 		// interpret this as if a _ was typed
 		recordUndo(cur, Undo::ATOMIC);
 		interpret(cur, '_');
 		break;
-		
+
 	case LFUN_SUPERSCRIPT:
 		// interpret this as if a ^ was typed
 		recordUndo(cur, Undo::ATOMIC);
diff --git a/src/support/tostr.h b/src/support/tostr.h
index 93e1f9a943..ead674b99c 100644
--- a/src/support/tostr.h
+++ b/src/support/tostr.h
@@ -20,6 +20,9 @@
 
 #include <string>
 
+
+#if 0
+// Commented out since BOOST_STATIC_ASSERT does not work with gcc 4.0
 template <class Target, class Source>
 Target convert(Source arg)
 {
@@ -28,6 +31,11 @@ Target convert(Source arg)
 	BOOST_STATIC_ASSERT(sizeof(bool) == 0);
 	return Target();
 }
+#else
+template <class Target, class Source>
+Target convert(Source arg);
+#endif
+
 
 template<>
 std::string convert<std::string>(bool);