Small tweaks

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

diff --git a/ChangeLog b/ChangeLog
index bcbeb080652ad0b3e781a9cfda4c9738db611f94..5518aa70fd6669db8738a29c9f009e5942bc19a1 100644 (file)
--- 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 3eb78ad986cde7987ae2fa93924c9f0a093aca05..2cc1ffe5ad1c920f4f612b50e55415d203cc7207 100644 (file)
--- 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 1792545ea2cd8689828c99e776c8a795d725ab57..d094285022e96dce27f3c053bb368baaf478ad0f 100644 (file)
--- 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 b42e189a9151b389909285d383f71732abd14e96..f5a7f20ae4ff105064b104c4b4276dc054cd9255 100644 (file)
--- 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 0181407c42f793ae84bd121e0086a49bf631854e..c4bac76195a51cc5ca13c9e4ba2e03821292bcb0 100644 (file)
--- 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 \