md3sIam · md3sIam · Feb 18, 2020
diff --git a/dev/CMakeLists.txt b/dev/CMakeLists.txt
@@ -102,3 +102,5 @@ install (FILES ${HEADERS} ${HEADERS2} DESTINATION include/gpstk )
 add_subdirectory (apps)
 add_subdirectory (examples)
 
+include(CPack)
+
diff --git a/dev/apps/Rinextools/RinDump.cpp b/dev/apps/Rinextools/RinDump.cpp
@@ -117,7 +117,7 @@ class LinCom {
 
    /// compute the linear combination, given the satellite and RINEX data
    double Compute(const RinexSatID sat, Rinex3ObsHeader& Rhead,
-                  const vector<RinexDatum>& vrdata) throw(Exception);
+                  const vector<Rinex3Datum>& vrdata) throw(Exception);
 
    /// remove a bias if jump larger than limit occurs
    bool removeBias(const RinexSatID& sat) throw();
@@ -253,7 +253,7 @@ const string Configuration::longfmt = calfmt + " = " + gpsfmt;
 int Initialize(string& errors) throw(Exception);
 int ProcessFiles(void) throw(Exception);
 double getObsData(string tag, RinexSatID sat, Rinex3ObsHeader& Rhead,
-                  const vector<RinexDatum>& vrdata) throw(Exception);
+                  const vector<Rinex3Datum>& vrdata) throw(Exception);
 double getNonObsData(string tag, RinexSatID sat, const CommonTime& time)
    throw(Exception);
 
@@ -1687,7 +1687,7 @@ try {
                   }
 
                   // access the data
-                  const vector<RinexDatum>& vrdata(it->second);
+                  const vector<Rinex3Datum>& vrdata(it->second);
 
                   // don't output all zero's, or elev > elevlimit
                   ok = false;                // reuse ok; if one datum is good, output
@@ -1768,7 +1768,7 @@ catch(Exception& e) { GPSTK_RETHROW(e); }
 
 //------------------------------------------------------------------------------------
 double getObsData(string tag, RinexSatID sat, Rinex3ObsHeader& Rhead,
-                   const vector<RinexDatum>& vrdata) throw(Exception)
+                   const vector<Rinex3Datum>& vrdata) throw(Exception)
 {
    try {
       double data(0);
@@ -2200,7 +2200,7 @@ bool LinCom::ParseAndSave(const string& lab, bool save) throw()
 
 //------------------------------------------------------------------------------------
 double LinCom::Compute(const RinexSatID sat, Rinex3ObsHeader& Rhead,
-                  const vector<RinexDatum>& vrdata) throw(Exception)
+                  const vector<Rinex3Datum>& vrdata) throw(Exception)
 {
    Configuration& C(Configuration::Instance());
 

diff --git a/dev/apps/Rinextools/RinSum.cpp b/dev/apps/Rinextools/RinSum.cpp
@@ -731,7 +731,7 @@ try {
                      RinexSatID(-1,sat.system)) != C.exSats.end())
                continue;
 
-            const vector<RinexDatum>& vecData(it->second);
+            const vector<Rinex3Datum>& vecData(it->second);
 
             // find this sat in the table; add it if necessary
             vector<TableData>::iterator ptab;

diff --git a/dev/apps/geomatics/JPLeph/convertSSEph.cpp b/dev/apps/geomatics/JPLeph/convertSSEph.cpp
@@ -203,7 +203,7 @@ try {
    totaltime = clock()-totaltime;
    LOG(INFO) << PrgmName << " timing: " << fixed << setprecision(9)
       << double(totaltime)/double(CLOCKS_PER_SEC) << " seconds.";
-   if(LOGstrm != cout) cout << PrgmName << " timing: " << fixed << setprecision(9)
+   if(pLOGstrm != &cout) cout << PrgmName << " timing: " << fixed << setprecision(9)
       << double(totaltime)/double(CLOCKS_PER_SEC) << " seconds." << endl;
 
    return iret;

diff --git a/dev/apps/geomatics/JPLeph/testSSEph.cpp b/dev/apps/geomatics/JPLeph/testSSEph.cpp
@@ -216,7 +216,7 @@ try {
    totaltime = clock()-totaltime;
    LOG(INFO) << PrgmName << " timing: " << fixed << setprecision(9)
       << double(totaltime)/double(CLOCKS_PER_SEC) << " seconds.";
-   if(LOGstrm != cout) cout << PrgmName << " timing: " << fixed << setprecision(9)
+   if(pLOGstrm != &cout) cout << PrgmName << " timing: " << fixed << setprecision(9)
       << double(totaltime)/double(CLOCKS_PER_SEC) << " seconds." << endl;
 
    return iret;

diff --git a/dev/apps/positioning/PRSolve.cpp b/dev/apps/positioning/PRSolve.cpp
@@ -362,7 +362,7 @@ class SolutionData {
    // compute the actual datum, for the given satellite, given the RinexObsData vector
    // remember which ObsIDs were actually used, in usedobsids
    // return true if the data could be computed
-   bool ComputeData(const RinexSatID& sat, const vector<RinexDatum>& vrd)
+   bool ComputeData(const RinexSatID& sat, const vector<Rinex3Datum>& vrd)
    {
       usedobsids.clear();
       RawPR.clear();
@@ -491,7 +491,7 @@ class SolutionObject {
    // indicating whether there is sufficient good data.
    void CollectData(const RinexSatID& s,
                     const double& elev, const double& ER,
-                    const vector<RinexDatum>& v) throw();
+                    const vector<Rinex3Datum>& v) throw();
 
    // Compute a solution for the given epoch; call after CollectData()
    // same return value as RAIMCompute()
@@ -1381,7 +1381,7 @@ try {
          Rinex3ObsData::DataMap::iterator it;
          for(it=Rdata.obs.begin(); it!=Rdata.obs.end(); ++it) {
             sat = it->first;
-            vector<RinexDatum>& vrdata(it->second);
+            vector<Rinex3Datum>& vrdata(it->second);
             string sys(asString(sat.systemChar()));
 
             // is this system excluded?
@@ -2287,7 +2287,7 @@ void SolutionObject::EpochReset(void) throw()
 //------------------------------------------------------------------------------------
 void SolutionObject::CollectData(const RinexSatID& sat,
                                  const double& elev, const double& ER,
-                                 const vector<RinexDatum>& vrd)
+                                 const vector<Rinex3Datum>& vrd)
    throw()
 {
    if(!isValid) return;

diff --git a/dev/examples/example3.cpp b/dev/examples/example3.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
       roffs.exceptions(ios::failbit);
       Rinex3ObsHeader roh;
       Rinex3ObsData roe;
-      RinexDatum dataobj;
+      Rinex3Datum dataobj;
 
          // Read the RINEX header (don't skip this step)
          // --------------------------------------------

diff --git a/dev/lib/FileHandling/FFData.cpp b/dev/lib/FileHandling/FFData.cpp
@@ -1,14 +1,12 @@
 #pragma ident "$Id$"
 
-
-
 //============================================================================
 //
 //  This file is part of GPSTk, the GPS Toolkit.
 //
 //  The GPSTk 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
+//  by the Free Software Foundation; either version 3.0 of the License, or
 //  any later version.
 //
 //  The GPSTk is distributed in the hope that it will be useful,
@@ -38,11 +36,6 @@
 //
 //=============================================================================
 
-
-
-
-
-
 /**
  * @file FFData.cpp
  * Formatted File Data base class
@@ -54,7 +47,7 @@
 namespace gpstk
 {
    void FFData::putRecord(FFStream& s) const 
-      throw(FFStreamError, gpstk::StringUtils::StringException)
+      throw(FFStreamError, gpstk::StringUtils::StringException,std::bad_cast)
    { 
       s.tryFFStreamPut(*this); 
    }

diff --git a/dev/lib/FileHandling/FFData.hpp b/dev/lib/FileHandling/FFData.hpp
@@ -1,22 +1,12 @@
 #pragma ident "$Id$"
 
-
-
-/**
- * @file FFData.hpp
- * Formatted File Data base class
- */
-
-#ifndef GPSTK_FFDATA_HPP
-#define GPSTK_FFDATA_HPP
-
 //============================================================================
 //
 //  This file is part of GPSTk, the GPS Toolkit.
 //
 //  The GPSTk 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
+//  by the Free Software Foundation; either version 3.0 of the License, or
 //  any later version.
 //
 //  The GPSTk is distributed in the hope that it will be useful,
@@ -46,10 +36,13 @@
 //
 //=============================================================================
 
+/**
+ * @file FFData.hpp
+ * Formatted File Data base class
+ */
 
-
-
-
+#ifndef GPSTK_FFDATA_HPP
+#define GPSTK_FFDATA_HPP
 
 #include <iostream>
 #include <typeinfo>
@@ -102,7 +95,7 @@ namespace gpstk
           * @param s a FFStream-based stream
           */
       void putRecord(FFStream& s) const 
-         throw(FFStreamError, gpstk::StringUtils::StringException);
+         throw(FFStreamError, gpstk::StringUtils::StringException, std::bad_cast);
 
          /**
           * Retrieve a "record" from the given stream.
@@ -174,9 +167,7 @@ namespace gpstk
 
    protected:
          /// Does the actual reading from the stream into this FFData object.
-      virtual void reallyGetRecord(FFStream& s)
-         throw(std::exception, gpstk::StringUtils::StringException, 
-               gpstk::FFStreamError) = 0;
+      virtual void reallyGetRecord(FFStream& s) = 0;
 
          /// Does the actual writing from the stream into this FFData object.
       virtual void reallyPutRecord(FFStream& s) const
Original file line number	Diff line number	Diff line change
Expand Up		@@ -102,3 +102,5 @@ install (FILES ${HEADERS} ${HEADERS2} DESTINATION include/gpstk )
		add_subdirectory (apps)
		add_subdirectory (examples)

		include(CPack)