Commit 923c197a authored by ssides's avatar ssides Committed by Jesse Mapel
Browse files

Removed compile and deprication warnings. Fixes #4110

parent b50b8a1e
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -394,7 +394,10 @@ int main(int argc, char *argv[]) {
    qDebug() << "";

    qDebug() << "Testing assignment operator=...";
    copyStats = copyStats;
    {
      StatCumProbDistDynCalc &c = copyStats;
      copyStats = c;
    }
    qDebug() << "Min = " << copyStats.min();
    qDebug() << "Max = " << copyStats.max();
    qDebug() << "";
+4 −1
Original line number Diff line number Diff line
@@ -212,7 +212,10 @@ int main(int argc, char *argv[]) {
    qDebug() << "";

    qDebug() << "Testing assignment operator=...";
    s = s;
    {
      Statistics &tstats = s;
      s = tstats;
    }
    qDebug() << "Average:             " << s.Average();
    qDebug() << "Variance:            " << s.Variance();
    qDebug() << "Rms:                 " << s.Rms();
+4 −1
Original line number Diff line number Diff line
@@ -127,7 +127,10 @@ int main(int argc, char *argv[]) {
    qDebug() << "";

    qDebug() << "Testing assignment operator=...";
    results = results;
    {
      BundleResults &r = results;
      results = r;
    }
    printXml(results);

    BundleResults assignmentOpResults;
+5 −1
Original line number Diff line number Diff line
@@ -159,7 +159,11 @@ int main(int argc, char *argv[]) {
    printXml<BundleSettings>(copySettings);

    qDebug() << "Testing assignment operator to set this equal to itself...";
    settings = settings;
    {
      BundleSettings &s = settings;
      settings = s;
    }

    printXml<BundleSettings>(settings);

    qDebug() << "Testing assignment operator to create a new settings object...";
+20 −5
Original line number Diff line number Diff line
@@ -151,7 +151,10 @@ int main(int argc, char *argv[]) {
    printXml(copySettings);

    qDebug() << "Testing assignment operator to set this equal to itself...";
    boss = boss;
    {
      BundleObservationSolveSettings &tboss = boss;
      boss = tboss;
    }
    printXml(boss);

    qDebug() << "Testing assignment operator to create a new settings object...";
@@ -386,7 +389,10 @@ int main(int argc, char *argv[]) {
    qDebug() << "serial number = " << bi2->serialNumber();
    qDebug() << "file name     = " << bi2->fileName();
    qDebug() << "Testing assignment operator to set this equal to itself...";
    bi = bi;
    {
      BundleImage &tbi = bi;
      bi = tbi;
    }
    qDebug() << "serial number = " << bi.serialNumber();
    qDebug() << "file name     = " << bi.fileName();
    qDebug() << "Testing assignment operator to create a new object...";
@@ -430,7 +436,10 @@ int main(int argc, char *argv[]) {
                             bundleTargetBody);

    qDebug() << "Testing assignment operator to set this equal to itself...";
    bo2 = bo2;
    {
      BundleObservation &tbo2 = bo2;
      bo2 = tbo2;
    }
    qDebug() << "Testing assignment operator to create a new object...";
    bo = bo2;
    qDebug() << "Testing copy constructor...";
@@ -1102,7 +1111,10 @@ settings->setSolveOptions(false, false, false, false, SurfacePoint::Rectangular,
    bundleMeasureRejected.setRejected(true);

    // Test self-assignment
    bundleMeasure = bundleMeasure;
    {
      BundleMeasure &tbundleMeasure = bundleMeasure;
      bundleMeasure = tbundleMeasure;
    }

    qDebug() << "";
    // Verify state and copies
@@ -1394,7 +1406,10 @@ settings->setSolveOptions(false, false, false, false, SurfacePoint::Rectangular,
    qDebug() << "Test assignment operator";
    qDebug() << "";
    qDebug() << "Self assignment";
    btb3 = btb3;
    {
      BundleTargetBody &tbtb3 = btb3;
      btb3 = tbtb3;
    }
    qDebug().noquote() << btb3.formatBundleOutputString(true);
    qDebug() << "Assignment to other";
    btb3 = btb1;
Loading