ocaml 3.09 transition

[helm.git] / helm / DEVEL / mathml_editor / textomml / main.cc

diff --git a/helm/DEVEL/mathml_editor/textomml/main.cc b/helm/DEVEL/mathml_editor/textomml/main.cc
index cb7235a4cef3b5c733a8c139f55b56a6ff24c161..9da0f0993e52479e09b54cf226d0b6efb853b346 100644 (file)
--- a/helm/DEVEL/mathml_editor/textomml/main.cc
+++ b/helm/DEVEL/mathml_editor/textomml/main.cc
@@ -1,31 +1,31 @@
-/* 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 <getopt.h>
-
 #include <fstream>
+#include <cassert>
 
 #include "dom.hh"
 #include "TPushParser.hh"
@@ -98,7 +98,7 @@ parseError(const char* option)
   printHelp();
 }
 
-void
+int
 main(int argc, char* argv[])
 {
   CLoggerConsole logger;
@@ -175,7 +175,7 @@ main(int argc, char* argv[])
 
   if (optind < argc)
     {
-      ifstream file(argv[optind]);
+      std::ifstream file(argv[optind]);
       if (!file)
        {
          std::cerr << "can't open input file `" << argv[optind] << "'" << std::endl;