ocaml 3.09 transition

[helm.git] / helm / DEVEL / mathml_editor / src / Diff.cc

diff --git a/helm/DEVEL/mathml_editor/src/Diff.cc b/helm/DEVEL/mathml_editor/src/Diff.cc
index d33e77aa557bcc8f98785d61a33fb2525080adf4..d8df81201aec2a034725fe13c9477b2c53e4f3c5 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/Diff.cc
+++ b/helm/DEVEL/mathml_editor/src/Diff.cc
@@ -1,32 +1,33 @@
-/* Copyright (C) 2002-2003, Luca Padovani <luca.padovani@cs.unibo.it>,
- *                    2003, Paolo Marinelli <pmarinel@cs.unibo.it>.
- *
- * This file is part of EdiTeX, an editor of mathematical
- * expressions based on TeX syntax
+/* This file is part of EdiTeX, an editor of mathematical
+ * expressions based on TeX syntax.
  * 
- * EdiTeX is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * Copyright (C) 2002-2003 Luca Padovani <lpadovan@cs.unibo.it>,
+ *                    2003 Paolo Marinelli <pmarinel@cs.unibo.it>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * EdiTeX is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with EdiTeX; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- * 
- * For details, see the EdiTeX World-Wide-Web page,
- * http://helm.cs.unibo.it/editex, or send a mail to
- * <luca.padovani@cs.unibo.it>
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For more information, please visit the project's home page
+ * http://helm.cs.unibo.it/editex/
+ * or send an email to <lpadovan@cs.unibo.it>
  */
 
 #include <sstream>
 #include <functional>
 #include <vector>
 #include <algorithm>
+#include <cassert>
 
 #include "Diff.hh"
 
@@ -291,7 +292,7 @@ namespace GdomeSmartDOMExt
        if (elem.hasAttribute("count"))
          {
            unsigned count;
-           istringstream is(elem.getAttribute("count"));
+           std::istringstream is(elem.getAttribute("count"));
            is >> count;
            assert(count == 1);
          }
@@ -331,7 +332,7 @@ namespace GdomeSmartDOMExt
            unsigned count = 1;
            if (p2.hasAttribute("count"))
              {
-               istringstream is(p2.getAttribute("count"));
+               std::istringstream is(p2.getAttribute("count"));
                is >> count;
              }
            while (count-- > 0)
@@ -365,7 +366,7 @@ namespace GdomeSmartDOMExt
            unsigned count = 1;
            if (p2.hasAttribute("count"))
              {
-               istringstream is(p2.getAttribute("count"));
+               std::istringstream is(p2.getAttribute("count"));
                is >> count;
              }
            while (count-- > 0)