Keeping Clang happy... macros should not start with "__"...

meteoio/Config.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __CONFIGREADER_H__
-#define __CONFIGREADER_H__
+#ifndef CONFIGREADER_H
+#define CONFIGREADER_H
 
 #include <meteoio/IOUtils.h>
 #include <meteoio/FileUtils.h>

meteoio/DataGenerator.h

@@ -16,8 +16,8 @@
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __DATAGENERATOR_H__
-#define __DATAGENERATOR_H__
+#ifndef DATAGENERATOR_H
+#define DATAGENERATOR_H
 
 #include <meteoio/Config.h>
 #include <meteoio/dataClasses/MeteoData.h>

meteoio/FileUtils.h

@@ -14,8 +14,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __FILEUTILS_H__
-#define __FILEUTILS_H__
+#ifndef FILEUTILS_H
+#define FILEUTILS_H
 
 #include <sstream>
 #include <string>

meteoio/GeneratorAlgorithms.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __GENERATORALGORITHMS_H__
-#define __GENERATORALGORITHMS_H__
+#ifndef GENERATORALGORITHMS_H
+#define GENERATORALGORITHMS_H
 
 #include <meteoio/dataClasses/MeteoData.h>
 #include <meteoio/meteoLaws/Sun.h>

meteoio/Graphics.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __GRAPHICS_H__
-#define __GRAPHICS_H__
+#ifndef GRAPHICS_H
+#define GRAPHICS_H
 
 #include <meteoio/dataClasses/Array2D.h>
 

meteoio/GridsManager.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __GRIDSMANAGER_H__
-#define __GRIDSMANAGER_H__
+#ifndef GRIDSMANAGER_H
+#define GRIDSMANAGER_H
 
 #include <meteoio/DataGenerator.h>
 #include <meteoio/dataClasses/Buffer.h>

meteoio/IOExceptions.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __IOEXCEPTIONS_H__
-#define __IOEXCEPTIONS_H__
+#ifndef IOEXCEPTIONS_H
+#define IOEXCEPTIONS_H
 
 #include <exception>
 #include <string>
@@ -167,6 +167,4 @@ class MIO_API NoAvailableDataException : public IOException
 inline void printdebug(...) {}
 #endif
 
-#endif /*__IOException_H__*/
-
-
+#endif

meteoio/IOHandler.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __IOHANDLER_H__
-#define __IOHANDLER_H__
+#ifndef IOHANDLER_H
+#define IOHANDLER_H
 
 #include <meteoio/IOInterface.h>
 #include <meteoio/IOExceptions.h>

meteoio/IOInterface.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __IOINTERFACE_H__
-#define __IOINTERFACE_H__
+#ifndef IOINTERFACE_H
+#define IOINTERFACE_H
 
 #include <meteoio/dataClasses/Array1D.h>
 #include <meteoio/dataClasses/Array2D.h>

meteoio/IOManager.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __IOMANAGER_H__
-#define __IOMANAGER_H__
+#ifndef IOMANAGER_H
+#define IOMANAGER_H
 
 #include <meteoio/DataGenerator.h>
 #include <meteoio/Meteo2DInterpolator.h>

meteoio/IOUtils.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __IOUTILS_H__
-#define __IOUTILS_H__
+#ifndef IOUTILS_H
+#define IOUTILS_H
 
 #include <iostream>
 #include <string>

meteoio/InterpolationAlgorithms.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __INTERPOLATIONALGORITHMS_H__
-#define __INTERPOLATIONALGORITHMS_H__
+#ifndef INTERPOLATIONALGORITHMS_H
+#define INTERPOLATIONALGORITHMS_H
 
 #include <meteoio/dataClasses/DEMObject.h>
 #include <meteoio/dataClasses/MeteoData.h>

meteoio/MainPage.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __MAINPAGE_H__
-#define __MAINPAGE_H__
+#ifndef MAINPAGE_H
+#define MAINPAGE_H
 
 namespace mio {
 //groups

meteoio/MathOptim.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __MATHOPTIM_H__
-#define __MATHOPTIM_H__
+#ifndef MATHOPTIM_H
+#define MATHOPTIM_H
 
 #include <stdint.h>
 #include <cmath>

meteoio/Meteo1DInterpolator.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __METEO1DINTERPOLATOR_H__
-#define __METEO1DINTERPOLATOR_H__
+#ifndef METEO1DINTERPOLATOR_H
+#define METEO1DINTERPOLATOR_H
 
 #include <meteoio/dataClasses/MeteoData.h>
 #include <meteoio/dataClasses/StationData.h>

meteoio/Meteo2DInterpolator.h

@@ -16,8 +16,8 @@
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __METEO2DINTERPOLATOR_H__
-#define __METEO2DINTERPOLATOR_H__
+#ifndef METEO2DINTERPOLATOR_H
+#define METEO2DINTERPOLATOR_H
 
 #include <meteoio/TimeSeriesManager.h>
 #include <meteoio/Config.h>

meteoio/MeteoIO.h

@@ -16,8 +16,8 @@
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __METEOIO_H__
-#define __METEOIO_H__
+#ifndef METEOIO_H
+#define METEOIO_H
 
 #ifdef _MSC_VER
 //VC++ complains that it can not generate an assignment operator

meteoio/MeteoProcessor.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __METEOPROCESSOR_H__
-#define __METEOPROCESSOR_H__
+#ifndef METEOPROCESSOR_H
+#define METEOPROCESSOR_H
 
 #include <meteoio/dataClasses/MeteoData.h>
 #include <meteoio/dataClasses/StationData.h>

meteoio/ResamplingAlgorithms.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __RESAMPLINGALGORITHMS_H__
-#define __RESAMPLINGALGORITHMS_H__
+#ifndef RESAMPLINGALGORITHMS_H
+#define RESAMPLINGALGORITHMS_H
 
 #include <meteoio/dataClasses/MeteoData.h>
 #include <meteoio/dataClasses/StationData.h>

meteoio/ResamplingAlgorithms2D.h

@@ -15,8 +15,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with MeteoIO.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef __RESAMPLINGALGORITHMS2D_H__
-#define __RESAMPLINGALGORITHMS2D_H__
+#ifndef RESAMPLINGALGORITHMS2D_H
+#define RESAMPLINGALGORITHMS2D_H
 
 #include <meteoio/dataClasses/Grid2DObject.h>
 #include <iostream>