Changeset 7211

Timestamp:

May 25, 2006, 11:19:45 AM (20 years ago)

Author:

Paul Price

Message:

Removing psDB_dummy.h in favour of putting its function into psDB.h so that we only have a single source.

Location:

trunk/psLib/src

Files:

• db/Makefile.am (modified) (1 diff)
• db/psDB.h (modified) (2 diffs)
• db/psDB_dummy.h (deleted)
• pslib_strict.h (modified) (2 diffs)

trunk/psLib/src/db/Makefile.am

@@ -11 +11 @@
 pslibincludedir = $(includedir)
 pslibinclude_HEADERS = \
-        psDB.h \
-        psDB_dummy.h
+        psDB.h
 
 CLEANFILES = *~

trunk/psLib/src/db/psDB.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-05 02:42:01 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-25 21:19:45 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -331 +331 @@
 /// @}
 
+#else
+typedef void psDB;
 #endif // OMIT_PSDB
 

trunk/psLib/src/pslib_strict.h

@@ -9 +9 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-22 00:47:06 $
+*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-25 21:19:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
 #include "psEarthOrientation.h"
 
-#ifdef OMIT_PSDB
-#include "psDB_dummy.h"
-#else
 #include "psDB.h"
-#endif
 
 #include "psVectorFFT.h"