From 31a249af844b4d2e23a966a140a534e541973a64 Mon Sep 17 00:00:00 2001 From: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:56:27 -0700 Subject: [PATCH] Cleans Build Warnings (#5576) * cleans build warnings * remove unused variables --- isis/src/base/objs/CSMCamera/CSMCamera.h | 3 --- .../base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp | 1 - isis/src/base/objs/ProcessByBrick/ProcessByBrick.h | 9 +++++++-- isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/isis/src/base/objs/CSMCamera/CSMCamera.h b/isis/src/base/objs/CSMCamera/CSMCamera.h index 14756482ff..2d3bffb4f3 100644 --- a/isis/src/base/objs/CSMCamera/CSMCamera.h +++ b/isis/src/base/objs/CSMCamera/CSMCamera.h @@ -147,9 +147,6 @@ namespace Isis { csm::RasterGM *m_model; //! CSM sensor model iTime m_refTime; //! The reference time that all model image times are relative to - SpiceRotation *m_bodyRotation = NULL; //!< Body spice rotation - SpiceRotation *m_instrumentRotation = NULL; //!< Instrument spice rotation - Longitude *m_solarLongitude = NULL; void isisToCsmPixel(double line, double sample, csm::ImageCoord &csmPixel) const; void csmToIsisPixel(csm::ImageCoord csmPixel, double &line, double &sample) const; diff --git a/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp b/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp index 19b3306fa7..3ef47feecc 100644 --- a/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp +++ b/isis/src/base/objs/EmbreeTargetShape/EmbreeTargetShape.cpp @@ -471,7 +471,6 @@ namespace Isis { if (!isValid()) { return; } - int tri = 0; Triangle *triangles = (Triangle *)rtcSetNewGeometryBuffer(rtcMesh, RTC_BUFFER_TYPE_INDEX, 0, RTC_FORMAT_UINT3, sizeof(Triangle), numberOfPolygons()); // Add the body's face (vertex indices) to the Embree device's index buffer for (int t = 0; t < numberOfPolygons(); ++t) { diff --git a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h index bdc3a48c31..8e7a32b64e 100644 --- a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h +++ b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h @@ -748,13 +748,18 @@ namespace Isis { * * @internal */ - class ProcessIterator : public std::iterator< - std::forward_iterator_tag, int> { + class ProcessIterator { public: ProcessIterator(int position); ProcessIterator(const ProcessIterator &other); virtual ~ProcessIterator(); + using value_type = int; + using iterator_category = std::forward_iterator_tag; + using difference_type = std::ptrdiff_t; + using pointer = int*; + using reference = int&; + ProcessIterator &operator++(); /** diff --git a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp index ec039a1bbf..d20c81f30e 100644 --- a/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/tgocassisstitch.cpp @@ -52,7 +52,7 @@ namespace Isis { void tgocassisstitch(UserInterface &ui) { - QMap frameMap; + QMultiMap frameMap; try { // Open up the list of framelet files @@ -128,7 +128,7 @@ namespace Isis { frameletList.fileName(i) ); } - return frameMap; + return std::move(frameMap); } -- GitLab