Merge branch 'cdeil/compiler_warnings'

Fix some unimportant compiler warnings to have a clean build.

Merge branch 'cdeil/compiler_warnings'
Fix some unimportant compiler warnings to have a clean build.
Jürgen Knödlseder
2 parents b0c28c0a b4fb8da3
Showing 10 changed files with 13 additions and 14 deletions
include/GObservationRegistry.hpp
inst/cta/include/GCTAModelRadialRegistry.hpp
inst/cta/src/GCTAResponse_helpers.hpp
inst/cta/test/test_CTA.cpp
src/linalg/GMatrixSparse.cpp
src/sky/GWcs.cpp
src/test/GTestSuite.cpp
src/xml/GXml.cpp
test/test_GFits.cpp
test/test_GXml.cpp
@@ -84,17 +84,17 @@ private:
     static int& number() {
         static int m_number = 0;
         return m_number;
-    };
+    }
     // Model names
     static GRegistryPointer<std::string>& names() {
         static GRegistryPointer<std::string> m_names;
         return m_names;
-    };
+    }
     // Pointer to seed models
     static GRegistryPointer<const GObservation*>& obs() {
         static GRegistryPointer<const GObservation*> m_obs;
         return m_obs;
-    };
+    }
 };
  
  
@@ -83,17 +83,17 @@ private:
     static int& number() {
         static int m_number = 0;
         return m_number;
-    };
+    }
     // Model names
     static GRegistryPointer<std::string>& names() {
         static GRegistryPointer<std::string> m_names;
         return m_names;
-    };
+    }
     // Pointer to seed models
     static GRegistryPointer<const GCTAModelRadial*>& models() {
         static GRegistryPointer<const GCTAModelRadial*> m_models;
         return m_models;
-    };
+    }
 };
  
  
@@ -343,8 +343,8 @@ public:
                                 m_srcTime(srcTime),
                                 m_obs(obs),
                                 m_rot(rot),
-                                m_sin_rho(sin_rho),
-                                m_cos_rho(cos_rho) { }
+                                m_cos_rho(cos_rho),
+                                m_sin_rho(sin_rho) { }
     double eval(const double& omega);
 protected:
     const GCTAResponse&    m_rsp;        //!< CTA response
@@ -260,7 +260,7 @@ void TestGCTAResponse::test_response_psf_king(void)
         double r_max = rsp.psf()->delta_max(eng.log10TeV()) * gammalib::rad2deg;
         double r     = 0.0;
         double dr    = 0.0001;
-        int    steps = int(1.0/dr);
+        int    steps = int(r_max / dr);
         double sum   = 0.0;
         for (int i = 0; i < steps; ++i) {
             r   += dr;
@@ -3516,7 +3516,7 @@ GMatrixSparse cs_symperm(const GMatrixSparse&amp; matrix, const int* pinv)
  * @brief Compute transpose matrix
  *
  * @param[in] matrix Matrix.
- * @param[in] value Flag that signals if values should be copied.
+ * @param[in] values Flag that signals if values should be copied.
  *
  * The flag 'values' allows to avoid copying the actual data values. This
  * allows to perform a logical matrix transposition, as needed by the
@@ -2194,7 +2194,6 @@ void GWcs::sph_s2x(int nlng, int nlat, int sll, int spt,
         for (int ilng = 0; ilng < nlng; ++ilng, rowoff += spt, lngp += sll) {
             double  dlng   = *lngp - m_euler[0];
             double* phip   = phi + rowoff;
-            double* thetap = theta;
             for (int ilat = 0; ilat < mlat; ++ilat, phip += rowlen) {
                 *phip = dlng;
             }
@@ -578,7 +578,7 @@ void GTestSuite::test_try_success(void)
     // If the stack is empty
     if (m_stack_try.empty()) {
         throw GException::test_nested_try_error(G_TRY_SUCCESS, 
-              "Called "G_TRY_SUCCESS" without a previous call to test_try()");
+              "Called \"G_TRY_SUCCESS\" without a previous call to test_try()");
     }
  
     // Add test case to test suite
@@ -660,7 +660,6 @@ void GXml::parse(const GUrl&amp; url)
 {
     // Initialise parser
     int         c;
-    int         index      = 0;
     bool        in_markup  = false;
     bool        in_comment = false;
     std::string segment;
@@ -479,7 +479,6 @@ void TestGFits::test_create(void)
     try {
         GFits fits;
         fits.open("test.fits");
-        GFitsHDU*         hdu   = fits.at(0);
         GFitsImageDouble* image = static_cast<GFitsImageDouble*>(fits.at(1));
         int nx = image->naxes(0);
         int ny = image->naxes(1);
@@ -327,6 +327,7 @@ void TestGXml::test_GXml_access(void)
     // Test node access
     for (int i = 0; i < xml.size(); ++i) {
         GXmlNode* ptr = xml[i];
+        test_assert(ptr != 0, "Test node access");
     }
     test_assert(xml.elements() == 1,
                 "Test if xml.elements()==1",
@@ -336,6 +337,7 @@ void TestGXml::test_GXml_access(void)
     // Test node access
     for (int i = 0; i < xml.elements(); ++i) {
         GXmlNode* ptr = xml.element(i);
+        test_assert(ptr != 0, "Test xml element access");
     }
     test_assert(xml.elements("source_library") == 1,
                 "Test if the source_library = 1",