Reverted change to LString.h. Small fix to Buffer.C's tag_name.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1816 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-03-23 16:46:39 +00:00
parent 5de19b909e
commit fb28d5b938
3 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,10 @@
2001-03-23 Angus Leeming <a.leeming@ic.ac.uk>
* LString.h: removed "using std::getline"!
* buffer.C (tag_name): removed redundant break statements as they were
producing lots of warnings with my compiler.
2001-03-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-03-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* LString.h: add "using std::getline" when using the real <string>. * LString.h: add "using std::getline" when using the real <string>.

View File

@ -15,7 +15,6 @@
#ifndef USE_INCLUDED_STRING #ifndef USE_INCLUDED_STRING
#include <string> #include <string>
using std::string; using std::string;
using std::getline
#else #else
#ifdef __STRING__ #ifdef __STRING__
#error The <string> header has been included before LString.h #error The <string> header has been included before LString.h

View File

@ -2817,13 +2817,13 @@ enum PAR_TAG {
string tag_name(PAR_TAG const & pt) { string tag_name(PAR_TAG const & pt) {
switch (pt) { switch (pt) {
case NONE: return "!-- --"; break; case NONE: return "!-- --";
case TT: return "tt"; break; case TT: return "tt";
case SF: return "sf"; break; case SF: return "sf";
case BF: return "bf"; break; case BF: return "bf";
case IT: return "it"; break; case IT: return "it";
case SL: return "sl"; break; case SL: return "sl";
case EM: return "em"; break; case EM: return "em";
} }
return ""; return "";
} }