C++ - ified comments. Make file open errors fatal.

diff --git a/Math/interpolater.cxx b/Math/interpolater.cxx
index 5c552a4e052fd7452c546777593273b7575d7a97..74f583110c553eca9dd9d6f6128c32008eeb10b7 100644 (file)
--- a/Math/interpolater.cxx
+++ b/Math/interpolater.cxx
@@ -46,7 +46,7 @@ fgINTERPTABLE::fgINTERPTABLE( char *file ) {
     if ( (fd = gzopen(gzfile, "r")) == NULL ) {
         // Next try "path"
         if ( (fd = gzopen(file, "r")) == NULL ) {
-            fgPrintf(FG_MATH, FG_ALERT, "Cannot open file: %s\n", file);
+            fgPrintf(FG_MATH, FG_EXIT, "Cannot open file: %s\n", file);
         }
     }
 
@@ -56,7 +56,7 @@ fgINTERPTABLE::fgINTERPTABLE( char *file ) {
            sscanf(line, "%lf %lf\n", &(table[size][0]), &(table[size][1]));
            size++;
        } else {
-            fgPrintf( FG_MATH, FG_ALERT, 
+            fgPrintf( FG_MATH, FG_EXIT, 
                      "fgInterpolateInit(): Exceed max table size = %d\n",
                      MAX_TABLE_SIZE );
        }
@@ -77,7 +77,7 @@ double fgINTERPTABLE::interpolate(double x) {
        i++;
     }
 
-    printf ("i = %d ", i);
+    // printf ("i = %d ", i);
 
     if ( (i == 0) && (x < table[0][0]) ) {
        fgPrintf( FG_MATH, FG_ALERT, 
@@ -107,10 +107,12 @@ fgINTERPTABLE::~fgINTERPTABLE( void ) {
 
 
 // $Log$
+// Revision 1.2  1998/04/22 13:18:10  curt
+// C++ - ified comments.  Make file open errors fatal.
+//
 // Revision 1.1  1998/04/21 19:14:23  curt
 // Modified Files:
 //     Makefile.am Makefile.in
 // Added Files:
 //     interpolater.cxx interpolater.hxx
 //
-//

diff --git a/Math/interpolater.hxx b/Math/interpolater.hxx
index 00d448f2ad0dd9741b5bfc04af6aa97c5f3d25a3..92a8a031910e2a0e91b060ebd82e2a39be507ab6 100644 (file)
--- a/Math/interpolater.hxx
+++ b/Math/interpolater.hxx
@@ -1,28 +1,27 @@
-/**************************************************************************
- * interpolater.hxx -- routines to handle linear interpolation from a table of
- *                     x,y   The table must be sorted by "x" in ascending order
- *
- * Written by Curtis Olson, started April 1998.
- *
- * Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
- *
- * This program 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.
- *
- * This program 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
- * (Log is kept at end of this file)
- **************************************************************************/
+//
+// interpolater.hxx -- routines to handle linear interpolation from a table of
+//                     x,y   The table must be sorted by "x" in ascending order
+//
+// Written by Curtis Olson, started April 1998.
+//
+// Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
+//
+// This program 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.
+//
+// This program 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.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+// (Log is kept at end of this file)
 
 
 #ifndef _INTERPOLATER_H
@@ -55,14 +54,16 @@ public:
 };
 
 
-#endif /* _INTERPOLATER_H */
+#endif // _INTERPOLATER_H
 
 
-/* $Log$
-/* Revision 1.1  1998/04/21 19:14:23  curt
-/* Modified Files:
-/*     Makefile.am Makefile.in
-/* Added Files:
-/*     interpolater.cxx interpolater.hxx
-/*
- */
+// $Log$
+// Revision 1.2  1998/04/22 13:18:10  curt
+// C++ - ified comments.  Make file open errors fatal.
+//
+// Revision 1.1  1998/04/21 19:14:23  curt
+// Modified Files:
+//     Makefile.am Makefile.in
+// Added Files:
+//     interpolater.cxx interpolater.hxx
+//