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

diff --git a/src/ChangeLog b/src/ChangeLog
index 98154035de4b2635524846931cee1a66dbc49a34..99b6fcee4713ea7738515885b9e7ea2b258fab1c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
        * LString.h: add "using std::getline" when using the real <string>.

diff --git a/src/LString.h b/src/LString.h
index 7a4779d727ca846a412a94d8ae15a873993577a9..3a684322a10d24dadfdd399265e85646732a232a 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -15,7 +15,6 @@
 #ifndef USE_INCLUDED_STRING
 #include <string>
 using std::string;
-using std::getline
 #else
 #ifdef __STRING__
 #error The <string> header has been included before LString.h

diff --git a/src/buffer.C b/src/buffer.C
index bf7326b89556db3c9d3fe85cd880b4eef5dec82b..f13af04fe5d5e8f80fdad47a6b54a56e4339414c 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2817,13 +2817,13 @@ enum PAR_TAG {
 
 string tag_name(PAR_TAG const & pt) {
        switch (pt) {
-       case NONE: return "!-- --"; break;
-       case TT: return "tt"; break;
-       case SF: return "sf"; break;
-       case BF: return "bf"; break;
-       case IT: return "it"; break;
-       case SL: return "sl"; break;
-       case EM: return "em"; break;
+       case NONE: return "!-- --";
+       case TT: return "tt";
+       case SF: return "sf";
+       case BF: return "bf";
+       case IT: return "it";
+       case SL: return "sl";
+       case EM: return "em";
        }
        return "";
 }