From bb62c52401f4c30f88071b73c75dc84f426bf117 Mon Sep 17 00:00:00 2001 From: Eric Lidwa Date: Tue, 24 Oct 2023 23:13:26 +0000 Subject: [PATCH] removed inline keyword from implicitly inlined functions --- packages/core/TimeLib.h | 8 ++++---- plugins/icesat2/plugin/Atl08Dispatch.h | 4 ++-- plugins/landsat/plugin/LandsatHlsRaster.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/core/TimeLib.h b/packages/core/TimeLib.h index 274b92885..10f0ac92a 100644 --- a/packages/core/TimeLib.h +++ b/packages/core/TimeLib.h @@ -175,10 +175,10 @@ class TimeLib static void heartbeat (void); static void parsenistfile (void); - static inline int64_t GPS_TO_SYS (int64_t gpsnow) { return (((gpsnow) + 315964800000LL) * 1000); } // IN: milliseconds, OUT: microseconds - static inline int64_t SYS_TO_GPS (int64_t sysnow) { return (((sysnow) - 315964800000000LL) / 1000); } // IN: microseconds, OUT: milliseconds - static inline int64_t NTP_TO_SYS (int64_t ntpnow) { return (((ntpnow) - 2208988800LL)); } // IN: seconds, OUT: seconds - static inline double GPS_TO_SYS_EX (double gps_secs) { return (((gps_secs) + 315964800.0)); } // IN: seconds, OUT: seconds + static int64_t GPS_TO_SYS (int64_t gpsnow) { return (((gpsnow) + 315964800000LL) * 1000); } // IN: milliseconds, OUT: microseconds + static int64_t SYS_TO_GPS (int64_t sysnow) { return (((sysnow) - 315964800000000LL) / 1000); } // IN: microseconds, OUT: milliseconds + static int64_t NTP_TO_SYS (int64_t ntpnow) { return (((ntpnow) - 2208988800LL)); } // IN: seconds, OUT: seconds + static double GPS_TO_SYS_EX (double gps_secs) { return (((gps_secs) + 315964800.0)); } // IN: seconds, OUT: seconds }; #endif /* __time_lib__ */ diff --git a/plugins/icesat2/plugin/Atl08Dispatch.h b/plugins/icesat2/plugin/Atl08Dispatch.h index be32dcb1c..26e02ea4f 100644 --- a/plugins/icesat2/plugin/Atl08Dispatch.h +++ b/plugins/icesat2/plugin/Atl08Dispatch.h @@ -166,12 +166,12 @@ class Atl08Dispatch: public DispatchObject * Inline Methods *--------------------------------------------------------------------*/ - static inline bool isVegetation (Atl03Reader::photon_t* ph) + static bool isVegetation (Atl03Reader::photon_t* ph) { return (ph->atl08_class == Icesat2Parms::ATL08_CANOPY || ph->atl08_class == Icesat2Parms::ATL08_TOP_OF_CANOPY); } - static inline bool isGround (Atl03Reader::photon_t* ph) + static bool isGround (Atl03Reader::photon_t* ph) { return (ph->atl08_class == Icesat2Parms::ATL08_GROUND); } diff --git a/plugins/landsat/plugin/LandsatHlsRaster.h b/plugins/landsat/plugin/LandsatHlsRaster.h index 3725cde60..c9b0a4040 100644 --- a/plugins/landsat/plugin/LandsatHlsRaster.h +++ b/plugins/landsat/plugin/LandsatHlsRaster.h @@ -91,15 +91,15 @@ class LandsatHlsRaster: public GeoIndexedRaster static bool validateBand (band_type_t type, const char* bandName); - static inline bool isValidL8Band (const char* bandName) {return validateBand(LANDSAT8, bandName);} - static inline bool isValidS2Band (const char* bandName) {return validateBand(SENTINEL2,bandName);} - static inline bool isValidAlgoBand (const char* bandName) {return validateBand(ALGOBAND, bandName);} - static inline bool isValidAlgoName (const char* bandName) {return validateBand(ALGONAME, bandName);} + static bool isValidL8Band (const char* bandName) {return validateBand(LANDSAT8, bandName);} + static bool isValidS2Band (const char* bandName) {return validateBand(SENTINEL2,bandName);} + static bool isValidAlgoBand (const char* bandName) {return validateBand(ALGOBAND, bandName);} + static bool isValidAlgoName (const char* bandName) {return validateBand(ALGONAME, bandName);} /*-------------------------------------------------------------------- * Data *--------------------------------------------------------------------*/ - + std::string filePath; std::string indexFile; Dictionary bandsDict;