From 01fb6dd445c0bfd1382c773be1c78408387bbdb2 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 30 Oct 2015 16:14:36 +0100 Subject: [PATCH] Convert explicitly unsigned int to int (will suppress clang warnings). --- include/GApplicationPars.hpp | 4 ++-- include/GArf.hpp | 4 ++-- include/GEnergies.hpp | 2 +- include/GFits.hpp | 4 ++-- include/GFitsHeader.hpp | 4 ++-- include/GModel.hpp | 4 ++-- include/GModelSpatial.hpp | 2 +- include/GModelSpectral.hpp | 4 ++-- include/GModelSpectralNodes.hpp | 4 ++-- include/GModelTemporal.hpp | 2 +- include/GModels.hpp | 4 ++-- include/GNodeArray.hpp | 2 +- include/GObservations.hpp | 2 +- include/GOptimizerPars.hpp | 4 ++-- include/GPha.hpp | 4 ++-- include/GPhotons.hpp | 4 ++-- include/GSkyRegions.hpp | 4 ++-- include/GTestSuite.hpp | 4 ++-- include/GTestSuites.hpp | 4 ++-- include/GTimes.hpp | 4 ++-- include/GXmlNode.hpp | 4 ++-- inst/cta/include/GCTAEventList.hpp | 2 +- inst/cta/include/GCTAModelRadial.hpp | 4 ++-- inst/cta/include/GCTAModelRadialPolynom.hpp | 4 ++-- inst/cta/include/GCTAOnOffObservations.hpp | 4 ++-- inst/lat/include/GLATEventCube.hpp | 2 +- inst/lat/include/GLATEventList.hpp | 4 ++-- inst/lat/include/GLATResponse.hpp | 2 +- inst/mwl/include/GMWLSpectrum.hpp | 4 ++-- 29 files changed, 50 insertions(+), 50 deletions(-) diff --git a/include/GApplicationPars.hpp b/include/GApplicationPars.hpp index 54795a2..51673fd 100644 --- a/include/GApplicationPars.hpp +++ b/include/GApplicationPars.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GApplicationPars.hpp - Application parameters * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2014 by Juergen Knoedlseder * + * copyright (C) 2010-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -160,7 +160,7 @@ const GApplicationPar& GApplicationPars::operator[](const int& index) const inline int GApplicationPars::size(void) const { - return (m_pars.size()); + return (int)m_pars.size(); } diff --git a/include/GArf.hpp b/include/GArf.hpp index d934a12..6809e15 100644 --- a/include/GArf.hpp +++ b/include/GArf.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GArf.hpp - XSPEC Auxiliary Response File class * * ----------------------------------------------------------------------- * - * copyright (C) 2013-2014 by Juergen Knoedlseder * + * copyright (C) 2013-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -134,7 +134,7 @@ const double& GArf::operator[](const int& index) const inline int GArf::size(void) const { - return (m_specresp.size()); + return (int)m_specresp.size(); } diff --git a/include/GEnergies.hpp b/include/GEnergies.hpp index c0f5365..3b97cad 100644 --- a/include/GEnergies.hpp +++ b/include/GEnergies.hpp @@ -149,7 +149,7 @@ const GEnergy& GEnergies::operator[](const int& index) const inline int GEnergies::size(void) const { - return (m_energies.size()); + return (int)m_energies.size(); } diff --git a/include/GFits.hpp b/include/GFits.hpp index 72beb3c..75d7152 100644 --- a/include/GFits.hpp +++ b/include/GFits.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFits.hpp - FITS file class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2014 by Juergen Knoedlseder * + * copyright (C) 2008-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -231,7 +231,7 @@ const GFitsHDU* GFits::operator[](const std::string& extname) const inline int GFits::size(void) const { - return (m_hdu.size()); + return (int)m_hdu.size(); } diff --git a/include/GFitsHeader.hpp b/include/GFitsHeader.hpp index d469fd6..7e6b233 100644 --- a/include/GFitsHeader.hpp +++ b/include/GFitsHeader.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsHeader.hpp - FITS header cards container class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2014 by Juergen Knoedlseder * + * copyright (C) 2008-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -175,7 +175,7 @@ const GFitsHeaderCard& GFitsHeader::operator[](const std::string& keyname) const inline int GFitsHeader::size(void) const { - return (m_cards.size()); + return (int)m_cards.size(); } diff --git a/include/GModel.hpp b/include/GModel.hpp index a21c6fd..8eefb99 100644 --- a/include/GModel.hpp +++ b/include/GModel.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModel.hpp - Abstract virtual model base class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2014 by Juergen Knoedlseder * + * copyright (C) 2009-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -212,7 +212,7 @@ const GModelPar& GModel::operator[](const int& index) const inline int GModel::size(void) const { - return (m_pars.size()); + return (int)m_pars.size(); } diff --git a/include/GModelSpatial.hpp b/include/GModelSpatial.hpp index afcc720..73bd91e 100644 --- a/include/GModelSpatial.hpp +++ b/include/GModelSpatial.hpp @@ -157,7 +157,7 @@ const GModelPar& GModelSpatial::operator[](const int& index) const inline int GModelSpatial::size(void) const { - return (m_pars.size()); + return (int)m_pars.size(); } #endif /* GMODELSPATIAL_HPP */ diff --git a/include/GModelSpectral.hpp b/include/GModelSpectral.hpp index a44b720..1f6ec3e 100644 --- a/include/GModelSpectral.hpp +++ b/include/GModelSpectral.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModelSpectral.hpp - Abstract spectral model base class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2014 by Juergen Knoedlseder * + * copyright (C) 2009-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -155,7 +155,7 @@ const GModelPar& GModelSpectral::operator[](const int& index) const inline int GModelSpectral::size(void) const { - return (m_pars.size()); + return (int)m_pars.size(); } #endif /* GMODELSPECTRAL_HPP */ diff --git a/include/GModelSpectralNodes.hpp b/include/GModelSpectralNodes.hpp index 4d84f6c..8a18a7f 100644 --- a/include/GModelSpectralNodes.hpp +++ b/include/GModelSpectralNodes.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModelSpectralNodes.hpp - Spectral nodes model class * * ----------------------------------------------------------------------- * - * copyright (C) 2012-2014 by Juergen Knoedlseder * + * copyright (C) 2012-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -201,7 +201,7 @@ std::string GModelSpectralNodes::type(void) const inline int GModelSpectralNodes::nodes(void) const { - return (m_energies.size()); + return (int)m_energies.size(); } #endif /* GMODELSPECTRALNODES_HPP */ diff --git a/include/GModelTemporal.hpp b/include/GModelTemporal.hpp index 9fb11f7..efc5dba 100644 --- a/include/GModelTemporal.hpp +++ b/include/GModelTemporal.hpp @@ -134,7 +134,7 @@ const GModelPar& GModelTemporal::operator[](const int& index) const inline int GModelTemporal::size(void) const { - return (m_pars.size()); + return (int)m_pars.size(); } #endif /* GMODELTEMPORAL_HPP */ diff --git a/include/GModels.hpp b/include/GModels.hpp index dc248c7..a1015da 100644 --- a/include/GModels.hpp +++ b/include/GModels.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModels.hpp - Model container class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2014 by Juergen Knoedlseder * + * copyright (C) 2009-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -248,7 +248,7 @@ const GModel* GModels::operator[](const int& index) const inline int GModels::size(void) const { - return (m_models.size()); + return (int)m_models.size(); } diff --git a/include/GNodeArray.hpp b/include/GNodeArray.hpp index 9375eaa..74d0d87 100644 --- a/include/GNodeArray.hpp +++ b/include/GNodeArray.hpp @@ -184,7 +184,7 @@ const double& GNodeArray::operator[](const int& index) const inline int GNodeArray::size(void) const { - return (m_node.size()); + return (int)m_node.size(); } diff --git a/include/GObservations.hpp b/include/GObservations.hpp index 6cf8c8c..f7f3809 100644 --- a/include/GObservations.hpp +++ b/include/GObservations.hpp @@ -238,7 +238,7 @@ const GObservation* GObservations::operator[](const int& index) const inline int GObservations::size(void) const { - return (m_obs.size()); + return (int)m_obs.size(); } diff --git a/include/GOptimizerPars.hpp b/include/GOptimizerPars.hpp index 16f066a..a7336c3 100644 --- a/include/GOptimizerPars.hpp +++ b/include/GOptimizerPars.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GOptimizerPars.hpp - Optimizer parameter container class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2014 by Juergen Knoedlseder * + * copyright (C) 2009-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -152,7 +152,7 @@ const GOptimizerPar* GOptimizerPars::operator[](const int& index) const inline int GOptimizerPars::size(void) const { - return (m_pars.size()); + return (int)m_pars.size(); } diff --git a/include/GPha.hpp b/include/GPha.hpp index 7c7657e..d3d5d53 100644 --- a/include/GPha.hpp +++ b/include/GPha.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GPha.hpp - XSPEC Pulse Height Analyzer class * * ----------------------------------------------------------------------- * - * copyright (C) 2013-2014 by Juergen Knoedlseder * + * copyright (C) 2013-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -154,7 +154,7 @@ const double& GPha::operator[](const int& index) const inline int GPha::size(void) const { - return (m_counts.size()); + return (int)m_counts.size(); } diff --git a/include/GPhotons.hpp b/include/GPhotons.hpp index 115e6dc..78f06c0 100644 --- a/include/GPhotons.hpp +++ b/include/GPhotons.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GPhotons.hpp - Photon container class * * ----------------------------------------------------------------------- * - * copyright (C) 2012-2014 by Juergen Knoedlseder * + * copyright (C) 2012-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -99,7 +99,7 @@ std::string GPhotons::classname(void) const inline int GPhotons::size(void) const { - return m_photons.size(); + return (int)m_photons.size(); } diff --git a/include/GSkyRegions.hpp b/include/GSkyRegions.hpp index d99ae2c..9086dc8 100644 --- a/include/GSkyRegions.hpp +++ b/include/GSkyRegions.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GSkyRegions.hpp - Sky region container class * * ----------------------------------------------------------------------- * - * copyright (C) 2013-2014 by Pierrick Martin * + * copyright (C) 2013-2015 by Pierrick Martin * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -154,7 +154,7 @@ const GSkyRegion* GSkyRegions::operator[](const int& index) const inline int GSkyRegions::size(void) const { - return (m_regions.size()); + return (int)m_regions.size(); } diff --git a/include/GTestSuite.hpp b/include/GTestSuite.hpp index fb2f45a..5b5e05c 100644 --- a/include/GTestSuite.hpp +++ b/include/GTestSuite.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GTestSuite.hpp - Abstract test suite base class * * ----------------------------------------------------------------------- * - * copyright (C) 2012-2014 by Jean-Baptiste Cayrou * + * copyright (C) 2012-2015 by Jean-Baptiste Cayrou * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -129,7 +129,7 @@ protected: inline int GTestSuite::size(void) const { - return m_tests.size(); + return (int)m_tests.size(); } diff --git a/include/GTestSuites.hpp b/include/GTestSuites.hpp index cdf06bd..6d7f40b 100644 --- a/include/GTestSuites.hpp +++ b/include/GTestSuites.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GTestSuites.hpp - Test suite container class * * ----------------------------------------------------------------------- * - * copyright (C) 2012-2014 by Jean-Baptiste Cayrou * + * copyright (C) 2012-2015 by Jean-Baptiste Cayrou * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -155,7 +155,7 @@ const GTestSuite* GTestSuites::operator[](const int& index) const inline int GTestSuites::size(void) const { - return m_testsuites.size(); + return (int)m_testsuites.size(); } diff --git a/include/GTimes.hpp b/include/GTimes.hpp index c3ce558..7bd8360 100644 --- a/include/GTimes.hpp +++ b/include/GTimes.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GTimes.hpp - Time container class * * ----------------------------------------------------------------------- * - * copyright (C) 2012-2014 by Juergen Knoedlseder * + * copyright (C) 2012-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -99,7 +99,7 @@ std::string GTimes::classname(void) const inline int GTimes::size(void) const { - return m_times.size(); + return (int)m_times.size(); } diff --git a/include/GXmlNode.hpp b/include/GXmlNode.hpp index 3eca44c..a7d0d1d 100644 --- a/include/GXmlNode.hpp +++ b/include/GXmlNode.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GXmlNode.hpp - Abstract XML node base class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2014 by Juergen Knoedlseder * + * copyright (C) 2010-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -125,7 +125,7 @@ protected: inline int GXmlNode::size(void) const { - return m_nodes.size(); + return (int)m_nodes.size(); } diff --git a/inst/cta/include/GCTAEventList.hpp b/inst/cta/include/GCTAEventList.hpp index ff3cdc1..c1dce23 100644 --- a/inst/cta/include/GCTAEventList.hpp +++ b/inst/cta/include/GCTAEventList.hpp @@ -128,7 +128,7 @@ std::string GCTAEventList::classname(void) const inline int GCTAEventList::size(void) const { - return (m_events.size()); + return (int)m_events.size(); } diff --git a/inst/cta/include/GCTAModelRadial.hpp b/inst/cta/include/GCTAModelRadial.hpp index f5b5afd..cf29afe 100644 --- a/inst/cta/include/GCTAModelRadial.hpp +++ b/inst/cta/include/GCTAModelRadial.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GCTAModelRadial.hpp - Radial model abstract base class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2014 by Juergen Knoedlseder * + * copyright (C) 2011-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -73,7 +73,7 @@ public: virtual std::string print(const GChatter& chatter = NORMAL) const = 0; // Methods - int size(void) const { return m_pars.size(); } + int size(void) const { return (int)m_pars.size(); } protected: // Protected methods diff --git a/inst/cta/include/GCTAModelRadialPolynom.hpp b/inst/cta/include/GCTAModelRadialPolynom.hpp index eab3775..ebfcf8b 100644 --- a/inst/cta/include/GCTAModelRadialPolynom.hpp +++ b/inst/cta/include/GCTAModelRadialPolynom.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GCTAModelRadialPolynom.hpp - Radial Polynom CTA model class * * ----------------------------------------------------------------------- * - * copyright (C) 2011-2014 by Juergen Knoedlseder * + * copyright (C) 2011-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -139,7 +139,7 @@ std::string GCTAModelRadialPolynom::type(void) const inline int GCTAModelRadialPolynom::size(void) const { - return (m_coeffs.size()); + return (int)m_coeffs.size(); } #endif /* GCTAMODELRADIALPOLYNOM_HPP */ diff --git a/inst/cta/include/GCTAOnOffObservations.hpp b/inst/cta/include/GCTAOnOffObservations.hpp index 4de9d99..40917f5 100644 --- a/inst/cta/include/GCTAOnOffObservations.hpp +++ b/inst/cta/include/GCTAOnOffObservations.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GCTAOnOffObservations.hpp - CTA on-off observation container class * * ----------------------------------------------------------------------- * - * copyright (C) 2013-2014 by Pierrick Martin * + * copyright (C) 2013-2015 by Pierrick Martin * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -158,7 +158,7 @@ const GCTAOnOffObservation* GCTAOnOffObservations::operator[](const int& index) inline int GCTAOnOffObservations::size(void) const { - return (m_obs.size()); + return (int)m_obs.size(); } diff --git a/inst/lat/include/GLATEventCube.hpp b/inst/lat/include/GLATEventCube.hpp index 166912d..ffe3389 100644 --- a/inst/lat/include/GLATEventCube.hpp +++ b/inst/lat/include/GLATEventCube.hpp @@ -278,7 +278,7 @@ int GLATEventCube::ebins(void) const inline int GLATEventCube::ndiffrsp(void) const { - return m_srcmap.size(); + return (int)m_srcmap.size(); } #endif /* GLATEVENTCUBE_HPP */ diff --git a/inst/lat/include/GLATEventList.hpp b/inst/lat/include/GLATEventList.hpp index 865550a..9e2611a 100644 --- a/inst/lat/include/GLATEventList.hpp +++ b/inst/lat/include/GLATEventList.hpp @@ -115,7 +115,7 @@ std::string GLATEventList::classname(void) const inline int GLATEventList::size(void) const { - return m_events.size(); + return (int)m_events.size(); } @@ -127,7 +127,7 @@ int GLATEventList::size(void) const inline int GLATEventList::number(void) const { - return m_events.size(); + return (int)m_events.size(); } diff --git a/inst/lat/include/GLATResponse.hpp b/inst/lat/include/GLATResponse.hpp index 66b4b05..5d0ad53 100644 --- a/inst/lat/include/GLATResponse.hpp +++ b/inst/lat/include/GLATResponse.hpp @@ -164,7 +164,7 @@ bool GLATResponse::use_tdisp(void) const inline int GLATResponse::size(void) const { - return m_aeff.size(); + return (int)m_aeff.size(); } diff --git a/inst/mwl/include/GMWLSpectrum.hpp b/inst/mwl/include/GMWLSpectrum.hpp index 5a818d9..9e20464 100644 --- a/inst/mwl/include/GMWLSpectrum.hpp +++ b/inst/mwl/include/GMWLSpectrum.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GMWLSpectrum.hpp - Multi-wavelength spectrum class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2014 by Juergen Knoedlseder * + * copyright (C) 2010-2015 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -119,7 +119,7 @@ std::string GMWLSpectrum::classname(void) const inline int GMWLSpectrum::size(void) const { - return m_data.size(); + return (int)m_data.size(); } -- libgit2 0.21.4