From e19f533b0e3be182795a12ebb5514b8c594b82dd Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 6 Mar 2000 16:05:12 +0000
Subject: [PATCH] Small tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@587 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog                     | 10 ++++++++++
 src/buffer.C                  |  4 +++-
 src/insets/insetspecialchar.C |  1 +
 src/insets/insettext.C        |  2 ++
 src/support/Makefile.am       |  1 +
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bcbeb08065..5518aa70fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-03-06  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/support/Makefile.am (libsupport_la_SOURCES): add lyxmanip.h.
+
+	* src/buffer.C (makeLaTeXFile): add a .c_str(), since
+	ostringstream uses STL strings, and we might not.
+
+	* src/insets/insetspecialchar.C: add using directive.
+	* src/insets/insettext.C: ditto.
+
 2000-03-06  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
 	* lib/layouts/seminar.layout: feeble attempt at a layout for
diff --git a/src/buffer.C b/src/buffer.C
index 3eb78ad986..2cc1ffe5ad 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2006,7 +2006,9 @@ void Buffer::makeLaTeXFile(string const & fname,
 			ofs << ftnote.str();
 			texrow += ft_texrow;
 #ifdef HAVE_SSTREAM
-			ftnote.str(string());
+			// The extra .c_str() is needed when we use
+			// lyxstring instead of the STL string class. 
+			ftnote.str(string().c_str());
 #else
 			delete [] ftnote.str();
 #endif
diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index 1792545ea2..d094285022 100644
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -18,6 +18,7 @@
 #include "LaTeXFeatures.h"
 #include "Painter.h"
 
+using std::max;
 
 InsetSpecialChar::InsetSpecialChar(Kind k)
 	: kind(k)
diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index b42e189a91..f5a7f20ae4 100644
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -13,6 +13,8 @@
 
 #include <fstream>
 using std::ifstream;
+using std::min;
+using std::max;
 
 #include <cstdlib>
 
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 0181407c42..c4bac76195 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -37,6 +37,7 @@ libsupport_la_SOURCES = \
 	lstrings.C \
 	lstrings.h \
 	lyxlib.h \
+	lyxmanip.h \
 	$(LYXSTRING) lyxsum.C \
 	mkdir.C \
 	path.h \