[cig-commits] r14012 - in cs/spatialdata-0.1/trunk: . libsrc/geocoords libsrc/spatialdb libsrc/units libsrc/utils modulesrc/geocoords modulesrc/spatialdb modulesrc/units modulesrc/utils tests/pytests/spatialdb
brad at geodynamics.org
brad at geodynamics.org
Tue Feb 3 11:50:37 PST 2009
Author: brad
Date: 2009-02-03 11:50:37 -0800 (Tue, 03 Feb 2009)
New Revision: 14012
Added:
cs/spatialdata-0.1/trunk/libsrc/geocoords/geocoordsfwd.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/spatialdbfwd.hh
cs/spatialdata-0.1/trunk/libsrc/units/unitsfwd.hh
cs/spatialdata-0.1/trunk/libsrc/utils/utilsfwd.hh
Modified:
cs/spatialdata-0.1/trunk/
cs/spatialdata-0.1/trunk/configure.ac
cs/spatialdata-0.1/trunk/libsrc/geocoords/CSCart.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeo.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoLocalCart.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoProj.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/CSPicklerAscii.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/Converter.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/CoordSys.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/Geoid.hh
cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am
cs/spatialdata-0.1/trunk/libsrc/geocoords/Projector.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/Exception.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/GocadVoxet.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIO.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIOAscii.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh
cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh
cs/spatialdata-0.1/trunk/libsrc/units/Makefile.am
cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.hh
cs/spatialdata-0.1/trunk/libsrc/utils/LineParser.hh
cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am
cs/spatialdata-0.1/trunk/libsrc/utils/PointsStream.hh
cs/spatialdata-0.1/trunk/modulesrc/geocoords/
cs/spatialdata-0.1/trunk/modulesrc/spatialdb/
cs/spatialdata-0.1/trunk/modulesrc/units/
cs/spatialdata-0.1/trunk/modulesrc/utils/
cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py
Log:
Added header files to consolidate forward declarations.
Property changes on: cs/spatialdata-0.1/trunk
___________________________________________________________________
Name: svn:ignore
+ spatialdata.egg-info
configure
aux-config
autom4te.cache
portinfo.in
aclocal.m4
Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/configure.ac 2009-02-03 19:50:37 UTC (rev 14012)
@@ -11,7 +11,7 @@
#
AC_PREREQ(2.59)
-AC_INIT([spatialdata], [0.4.0], [baagaard at usgs.gov])
+AC_INIT([spatialdata], [0.5.0], [baagaard at usgs.gov])
AC_CONFIG_HEADER([portinfo])
AC_CONFIG_AUX_DIR([./aux-config])
AM_INIT_AUTOMAKE([foreign])
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/CSCart.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/CSCart.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/CSCart.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -22,13 +22,6 @@
#include "CoordSys.hh" // ISA CoordSys
-namespace spatialdata {
- namespace geocoords {
- class CSCart;
- class TestCSCart; // forward declaration
- } // geocoords
-} // spatialdata
-
/// C++ object for managing parameters defining Cartesian coordinate systems
class spatialdata::geocoords::CSCart : public CoordSys
{ // class CSCart
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeo.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeo.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeo.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -22,14 +22,6 @@
#include "CoordSys.hh" // ISA CoordSys
-namespace spatialdata {
- namespace geocoords {
- class CSGeo;
- class Geoid;
- class TestCSGeo; // forward declaration
- } // geocoords
-} // spatialdata
-
#include "proj4fwd.h" // Proj4 forward declaration
#include <string> // HASA std::string
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoLocalCart.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoLocalCart.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoLocalCart.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -22,13 +22,6 @@
#include "CSGeo.hh" // ISA CSGeo
-namespace spatialdata {
- namespace geocoords {
- class CSGeoLocalCart;
- class testCoordsysLoc; // forward declaration
- } // geocoords
-} // spatialdata
-
/// C++ object for defining a local cartesian coordinate system
class spatialdata::geocoords::CSGeoLocalCart : public CSGeo
{ // class CSGeoLocalCart
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoProj.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoProj.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/CSGeoProj.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -22,14 +22,6 @@
#include "CSGeo.hh" // ISA CSGeo
-namespace spatialdata {
- namespace geocoords {
- class CSGeoProj;
- class Projector; // HOLDSA projector
- class TestCSGeoproj; // forward declaration
- } // geocoords
-} // spatialdata
-
/// C++ object for defining a local cartesian coordinate system
class spatialdata::geocoords::CSGeoProj : public CSGeo
{ // class CSGeoProj
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/CSPicklerAscii.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/CSPicklerAscii.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/CSPicklerAscii.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,15 +20,10 @@
#if !defined(spatialdata_geocoords_cspicklerascii_hh)
#define spatialdata_geocoords_cspickerascii_hh
+#include "geocoordsfwd.hh"
+
#include <iosfwd> // USES std::istream, std::ostream
-namespace spatialdata {
- namespace geocoords {
- class CSPicklerAscii;
- class CoordSys;
- } // geocoords
-} // spatialdata
-
/// C++ object for pickling/unpickling coordinate systems for ascii streams.
class spatialdata::geocoords::CSPicklerAscii
{ // class CoordSys
@@ -40,16 +35,18 @@
* @param s Ouput stream
* @param pCS Pointer to coordinate system
*/
- static void pickle(std::ostream& s,
- const CoordSys* pCS);
+ static
+ void pickle(std::ostream& s,
+ const CoordSys* pCS);
/** Unpickle coordinate system.
*
* @param s Input stream
* @param ppCS Pointer to pointer to coordinate system
*/
- static void unpickle(std::istream& s,
- CoordSys** ppCS);
+ static
+ void unpickle(std::istream& s,
+ CoordSys** ppCS);
}; // class CSPicklerAscii
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/Converter.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/Converter.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/Converter.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,14 +20,7 @@
#if !defined(spatialdata_geocoords_converter_hh)
#define spatialdata_geocoords_converter_hh
-namespace spatialdata {
- namespace geocoords {
- class Converter;
- class CoordSys; // forward declaration
- class CSGeo; // forward declaration
- class CSCart; // forward declaration
- } // geocoords
-} // spatialdata
+#include "geocoordsfwd.hh"
/// C++ object for converting between coordinate systems.
class spatialdata::geocoords::Converter
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/CoordSys.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/CoordSys.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/CoordSys.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,14 +20,10 @@
#if !defined(spatialdata_geocoords_coordsys_hh)
#define spatialdata_geocoords_coordsys_hh
+#include "geocoordsfwd.hh"
+
#include <iosfwd> // USES std::istream, std::ostream
-namespace spatialdata {
- namespace geocoords {
- class CoordSys;
- } // geocoords
-} // spatialdata
-
/// C++ object for managing parameters defining a coordinate system
class spatialdata::geocoords::CoordSys
{ // class CoordSys
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/Geoid.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/Geoid.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/Geoid.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -21,14 +21,10 @@
#if !defined(spatialdata_geocoords_geoid_hh)
#define spatialdata_geocoords_geoid_hh
+#include "geocoordsfwd.hh"
+
#include <inttypes.h>
-namespace spatialdata {
- namespace geocoords {
- class Geoid;
- } // geocoords
-} // spatialdata
-
/// C++ object for converting difference between elevation relative to
/// mean seal level (MSL) and elevation relative to WGS ellipsoid.
class spatialdata::geocoords::Geoid
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/Makefile.am 2009-02-03 19:50:37 UTC (rev 14012)
@@ -32,6 +32,7 @@
Geoid.icc \
Projector.hh \
Projector.icc \
+ geocoordsfwd.hh \
proj4fwd.h
noinst_HEADERS =
Modified: cs/spatialdata-0.1/trunk/libsrc/geocoords/Projector.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/Projector.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/Projector.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,17 +20,12 @@
#if !defined(spatialdata_geocoords_projector_hh)
#define spatialdata_geocoords_projector_hh
-#include <string> // HASA std::string
+#include "geocoordsfwd.hh"
+
#include "proj4fwd.h" // Proj4 forward declaration
+#include <string> // HASA std::string
#include <iosfwd> // USES std::istream, std::ostream
-namespace spatialdata {
- namespace geocoords {
- class Projector;
- class CSGeo;
- } // geocoords
-} // spatialdata
-
/// C++ object for projecting to/from geographic projections
class spatialdata::geocoords::Projector
{ // class Projector
Added: cs/spatialdata-0.1/trunk/libsrc/geocoords/geocoordsfwd.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/geocoords/geocoordsfwd.hh (rev 0)
+++ cs/spatialdata-0.1/trunk/libsrc/geocoords/geocoordsfwd.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -0,0 +1,46 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file libsrc/geocoords/geocoordsfwd.hh
+ *
+ * @brief Forward declarations for spatialdata::geocoords objects.
+ *
+ * Including this header file eliminates the need to use separate
+ * forward declarations.
+ */
+
+#if !defined(spatialdata_geocoords_geocoordsfwd_hh)
+#define spatialdata_geocoords_geocoordsfwd_hh
+
+namespace spatialdata {
+ namespace geocoords {
+ class CoordSys;
+ class CSCart;
+ class CSGeo;
+ class CSGeoLocalCart;
+ class CSGeoProj;
+
+ class Projector;
+
+ class Geoid;
+
+ class Converter;
+
+ class CSPicklerAscii;
+ } // geocoords
+} // spatialdata
+
+
+#endif // spatialdata_geocoords_geocoordsfwd_hh
+
+
+// End of file
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/CompositeDB.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -22,14 +22,6 @@
#include <string> // HASA std::string
-namespace spatialdata {
- namespace spatialdb {
- class SpatialDB; // ISA SpatialDB
- class CompositeDB;
- class TestCompositeDB; // unit testing
- } // spatialdb
-} // spatialdata
-
/// C++ manager for simple spatial database.
class spatialdata::spatialdb::CompositeDB : public SpatialDB
{ // class CompositeDB
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/Exception.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/Exception.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/Exception.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -18,14 +18,10 @@
#if !defined(spatialdata_spatialdb_exception_hh)
#define spatialdata_spatialdb_exception_hh
+#include "spatialdbfwd.hh" // forward declarations
+
#include <stdexcept> // ISA std::runtime_error
-namespace spatialdata {
- namespace spatialdb {
- class OutOfBounds;
- } // spatialdb
-} // spatialdata
-
/// C++ exceptions for spatial database.
class spatialdata::spatialdb::OutOfBounds : public std::runtime_error
{ // class OutOfBounds
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/GocadVoxet.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/GocadVoxet.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/GocadVoxet.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -19,14 +19,10 @@
#if !defined(spatialdata_spatialdb_gocadvoxet_hh)
#define spatialdata_spatialdb_gocadvoxet_hh
+#include "spatialdbfwd.hh" // forward declarations
+
#include <string> // USES std::string
-namespace spatialdata {
- namespace spatialdb {
- class GocadVoxet;
- } // spatialdb
-} // spatialdata
-
class spatialdata::spatialdb::GocadVoxet
{ // GocadVoxet
friend class TestGocadVOxet; // unit testing
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/GravityField.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,18 +20,6 @@
#include "SpatialDB.hh"
-namespace spatialdata {
- namespace spatialdb {
- class SpatialDB; // ISA SpatialDB
- class GravityField;
- class TestGravityField; // unit testing
- } // spatialdb
-
- namespace geocoords {
- class CSGeo; // USES CSGeo
- } // geocoords
-} // spatialdata
-
/// C++ manager for simple spatial database.
class spatialdata::spatialdb::GravityField : public SpatialDB
{ // class GravityField
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/Makefile.am 2009-02-03 19:50:37 UTC (rev 14012)
@@ -35,7 +35,8 @@
SimpleDBData.hh \
SimpleDBData.icc \
UniformDB.hh \
- UniformDB.icc
+ UniformDB.icc \
+ spatialdbfwd.hh
noinst_HEADERS =
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SCECCVMH.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -13,23 +13,10 @@
#if !defined(spatialdata_spatialdb_sceccvmh_hh)
#define spatialdata_spatialdb_sceccvmh_hh
-#include "spatialdata/spatialdb/SpatialDB.hh" // ISA SpatialDB
+#include "SpatialDB.hh" // ISA SpatialDB
#include <string> // HASA std::string
-namespace spatialdata {
- namespace spatialdb {
- class SCECCVMH;
-
- class GocadVoxet; // HASA GocadVoxet
- class TestSCECCVMH; // unit testing
- } // spatialdb
-
- namespace geocoords {
- class CSGeoProj; // HASA CSGeoProj
- } // geocoords
-} // spatialdata
-
class spatialdata::spatialdb::SCECCVMH : SpatialDB
{ // SCECCVMH
friend class TestSCECCVMH; // unit testing
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDB.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,18 +20,6 @@
#include "SpatialDB.hh" // ISA Spatialdb
-namespace spatialdata {
- namespace spatialdb {
- class SpatialDB; // ISA SpatialDB
- class SimpleDB;
- class SimpleIO; // USES SimpleIO
- class SimpleDBData; // helper
- class SimpleDBQuery; // helper
- class TestSimpleDB; // unit testing
- class TestSimpleDBQuery; // unit testing
- } // spatialdb
-} // spatialdata
-
/// C++ manager for simple spatial database.
class spatialdata::spatialdb::SimpleDB : public SpatialDB
{ // class SimpleDB
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -18,16 +18,10 @@
#if !defined(spatialdata_spatialdb_simpledbdata_hh)
#define spatialdata_spatialdb_simpledbdata_hh
+#include "spatialdbfwd.hh" // forward declarations
+
#include <string> // USES std::string
-namespace spatialdata {
- namespace spatialdb {
- class SimpleDBData;
-
- class TestSimpleDBData; // unit testing
- } // spatialdb
-} // spatialdata
-
class spatialdata::spatialdb::SimpleDBData
{ // SimpleDBData
friend class TestSimpleDBData; // unit testing
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -18,12 +18,7 @@
#if !defined(spatialdata_spatialdb_simpledbquery_hh)
#define spatialdata_spatialdb_simpledbquery_hh
-namespace spatialdata {
- namespace spatialdb {
- class SimpleDBQuery;
- class TestSimpleDBQuery; // unit testing
- } // spatialdb
-} // spatialdata
+#include "spatialdbfwd.hh" // forward declarations
#include <vector> // USES std::vector
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIO.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIO.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIO.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -18,19 +18,11 @@
#if !defined(spatialdata_spatialdb_simpleio_hh)
#define spatialdata_spatialdb_simpleio_hh
+#include "spatialdbfwd.hh" // forward declarations
+#include "spatialdata/geocoords/geocoordsfwd.hh" // forward declarations
+
#include <string> // HASA std::string
-namespace spatialdata {
- namespace spatialdb {
- class SimpleIO;
- class SimpleDB; // USES SimpleDB
- class SimpleDBData; // USES SimpleDBData
- } // spatialdb
- namespace geocoords {
- class CoordSys; // USES CoordSys
- } // geocoords
-} // spatialdata
-
/// C++ manager for simple spatial database.
class spatialdata::spatialdb::SimpleIO
{ // class SimpleIO
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIOAscii.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIOAscii.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleIOAscii.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -22,12 +22,6 @@
#include <iosfwd> // USES std::istream
-namespace spatialdata {
- namespace spatialdb {
- class SimpleIOAscii;
- } // spatialdb
-} // spatialdata
-
// ----------------------------------------------------------------------
class spatialdata::spatialdb::SimpleIOAscii : public SimpleIO
{ // SimpleIOAscii
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SpatialDB.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -18,14 +18,8 @@
#if !defined(spatialdata_spatialdb_spatialdb_hh)
#define spatialdata_spatialdb_spatialdb_hh
-namespace spatialdata {
- namespace spatialdb {
- class SpatialDB;
- } // spatialdb
- namespace geocoords {
- class CoordSys; // forward declaration
- } // geocoords
-} // spatialdata
+#include "spatialdbfwd.hh"
+#include "spatialdata/geocoords/geocoordsfwd.hh"
/// C++ manager for spatial database.
class spatialdata::spatialdb::SpatialDB
Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/UniformDB.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -22,14 +22,6 @@
#include <string> // HASA std::string
-namespace spatialdata {
- namespace spatialdb {
- class SpatialDB; // ISA SpatialDB
- class UniformDB;
- class TestUniformDB; // unit testing
- } // spatialdb
-} // spatialdata
-
/// C++ manager for simple spatial database.
class spatialdata::spatialdb::UniformDB : public SpatialDB
{ // class UniformDB
Added: cs/spatialdata-0.1/trunk/libsrc/spatialdb/spatialdbfwd.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/spatialdbfwd.hh (rev 0)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/spatialdbfwd.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file libsrc/spatialdb/spatialdbfwd.hh
+ *
+ * @brief Forward declarations for spatialdata::spatialdb objects.
+ *
+ * Including this header file eliminates the need to use separate
+ * forward declarations.
+ */
+
+#if !defined(spatialdata_spatialdb_spatialdbfwd_hh)
+#define spatialdata_spatialdb_spatialdbfwd_hh
+
+namespace spatialdata {
+ namespace spatialdb {
+ class OutOfBounds;
+
+ class SpatialDB;
+ class SimpleDB;
+ class SimpleDBData;
+ class SimpleDBQuery;
+ class SimpleIO;
+ class SimpleIOAscii;
+ class UniformDB;
+ class CompositeDB;
+ class SCECCVMH;
+ class GocadVoxet;
+
+ class GravityField;
+
+ } // spatialdb
+} // spatialdata
+
+
+#endif // spatialdata_spatialdb_spatialdbfwd_hh
+
+
+// End of file
Modified: cs/spatialdata-0.1/trunk/libsrc/units/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/units/Makefile.am 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/units/Makefile.am 2009-02-03 19:50:37 UTC (rev 14012)
@@ -15,7 +15,8 @@
subpkginclude_HEADERS = \
Nondimensional.hh \
- Nondimensional.icc
+ Nondimensional.icc \
+ unitsfwd.hh
noinst_HEADERS =
Modified: cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/units/Nondimensional.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,14 +20,8 @@
#if !defined(spatialdata_units_nondimensional_hh)
#define spatialdata_units_nondimensional_hh
-namespace spatialdata {
- namespace units {
- class Nondimensional;
+#include "unitsfwd.hh"
- class TestNondimensional; // Unit testing
- } // units
-} // spatialdata
-
/// C++ object for managing parameters defining a coordinate system
class spatialdata::units::Nondimensional
{ // class Nondimensional
Added: cs/spatialdata-0.1/trunk/libsrc/units/unitsfwd.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/units/unitsfwd.hh (rev 0)
+++ cs/spatialdata-0.1/trunk/libsrc/units/unitsfwd.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file libsrc/units/unitsfwd.hh
+ *
+ * @brief Forward declarations for spatialdata::units objects.
+ *
+ * Including this header file eliminates the need to use separate
+ * forward declarations.
+ */
+
+#if !defined(spatialdata_units_unitsfwd_hh)
+#define spatialdata_units_unitsfwd_hh
+
+namespace spatialdata {
+ namespace units {
+ class Nondimensional;
+ } // units
+} // spatialdata
+
+
+#endif // spatialdata_units_unitsfwd_hh
+
+
+// End of file
Modified: cs/spatialdata-0.1/trunk/libsrc/utils/LineParser.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/utils/LineParser.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/utils/LineParser.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,15 +20,11 @@
#if !defined(spatialdata_utils_lineparser_hh)
#define spatialdata_utils_lineparser_hh
+#include "utilsfwd.hh"
+
#include <string> // HASA std::string
#include <iosfwd> // USES std::istream
-namespace spatialdata {
- namespace utils {
- class LineParser;
- } // utils
-} // spatialdata
-
class spatialdata::utils::LineParser
{ // LineParser
Modified: cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/utils/Makefile.am 2009-02-03 19:50:37 UTC (rev 14012)
@@ -16,7 +16,8 @@
subpkginclude_HEADERS = \
LineParser.hh \
PointsStream.hh \
- PointsStream.icc
+ PointsStream.icc \
+ utilsfwd.hh
noinst_HEADERS =
Modified: cs/spatialdata-0.1/trunk/libsrc/utils/PointsStream.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/utils/PointsStream.hh 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/libsrc/utils/PointsStream.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -20,12 +20,7 @@
#if !defined(spatialdata_utils_pointsstream_hh)
#define spatialdata_utils_pointsstream_hh
-namespace spatialdata {
- namespace utils {
- class PointsStream;
- class TestPointsStream; // forward declaration
- } // utils
-} // spatialdata
+#include "utilsfwd.hh"
#include <string> // HASA std::string
Added: cs/spatialdata-0.1/trunk/libsrc/utils/utilsfwd.hh
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/utils/utilsfwd.hh (rev 0)
+++ cs/spatialdata-0.1/trunk/libsrc/utils/utilsfwd.hh 2009-02-03 19:50:37 UTC (rev 14012)
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+/** @file libsrc/utils/utilsfwd.hh
+ *
+ * @brief Forward declarations for spatialdata::utils objects.
+ *
+ * Including this header file eliminates the need to use separate
+ * forward declarations.
+ */
+
+#if !defined(spatialdata_utils_utilsfwd_hh)
+#define spatialdata_utils_utilsfwd_hh
+
+namespace spatialdata {
+ namespace utils {
+ class LineParser;
+ class PointsStream;
+ } // utils
+} // spatialdata
+
+
+#endif // spatialdata_utils_utilsfwd_hh
+
+
+// End of file
Property changes on: cs/spatialdata-0.1/trunk/modulesrc/geocoords
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
geocoords.py
geocoords_wrap.cxx
Property changes on: cs/spatialdata-0.1/trunk/modulesrc/spatialdb
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
spatialdb.py
spatialdb_wrap.cxx
Property changes on: cs/spatialdata-0.1/trunk/modulesrc/units
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
units.py
units_wrap.cxx
Property changes on: cs/spatialdata-0.1/trunk/modulesrc/utils
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
utils.py
utils_wrap.cxx
Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py 2009-02-03 02:07:03 UTC (rev 14011)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py 2009-02-03 19:50:37 UTC (rev 14012)
@@ -19,7 +19,7 @@
def setUp(self):
from spatialdata.spatialdb.SCECCVMH import SCECCVMH
db = SCECCVMH()
- db.inventory.dataDir = "/Users/brad/data/sceccvm-h/vx52/bin"
+ db.inventory.dataDir = "/home/brad/data/sceccvm-h/vx53/bin"
db._configure()
self._db = db
return
More information about the CIG-COMMITS
mailing list