Fix a few warnings from Xcode 9.2 clang

ktf · ktf · commit 72b945e9ae64 · 2017-12-10T21:30:53.000+01:00
diff --git a/DataFormats/Headers/src/DataHeader.cxx b/DataFormats/Headers/src/DataHeader.cxx
@@ -105,10 +105,10 @@ o2::Header::BaseHeader::BaseHeader(uint32_t mySize, HeaderType desc,
 //__________________________________________________________________________________________________
 o2::Header::DataHeader::DataHeader()
   : BaseHeader(sizeof(DataHeader),sHeaderType,sSerializationMethod,sVersion)
+  , dataDescription(gDataDescriptionInvalid)
   , dataOrigin(gDataOriginInvalid)
   , reserved(gInvalidToken32)
   , payloadSerializationMethod(gSerializationMethodInvalid)
-  , dataDescription(gDataDescriptionInvalid)
   , subSpecification(0)
   , payloadSize(0)
 {
@@ -121,10 +121,10 @@ o2::Header::DataHeader::DataHeader(DataDescription desc,
                                    uint64_t size
                                    )
   : BaseHeader(sizeof(DataHeader),sHeaderType,sSerializationMethod,sVersion)
+  , dataDescription(desc)
   , dataOrigin(origin)
   , reserved(gInvalidToken32)
   , payloadSerializationMethod(gSerializationMethodInvalid)
-  , dataDescription(desc)
   , subSpecification(subspec)
   , payloadSize(size)
 {
diff --git a/Framework/Core/include/Framework/RemoteMetricsService.h b/Framework/Core/include/Framework/RemoteMetricsService.h
@@ -22,7 +22,7 @@ namespace framework {
 // This is a metrics service which sends metrics
 // to a separate MetricsDevice which funnels them
 // to the appropriate backend
-class RemoteMetricsService : public MetricService {
+class RemoteMetricsService : public MetricsService {
 public:
   void post(const char *label, float value) final;
   void post(const char *label, int value) final;
diff --git a/Framework/Core/include/Framework/RootFileService.h b/Framework/Core/include/Framework/RootFileService.h
@@ -11,7 +11,7 @@
 #define FRAMEWORK_ROOTFILESERVICE_H
 
 #include "Framework/Variant.h"
-#include "TFile.h"
+#include <TFile.h>
 
 #include <memory>
 #include <map>
diff --git a/Framework/Core/src/SimpleMetricsService.cxx b/Framework/Core/src/SimpleMetricsService.cxx
@@ -8,7 +8,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 #include "Framework/SimpleMetricsService.h"
-#include "FairMQLogger.h"
+#include <FairMQLogger.h>
 
 #include <chrono>
 
diff --git a/Framework/DebugGUI/src/DebugGUI.cxx b/Framework/DebugGUI/src/DebugGUI.cxx
@@ -1,7 +1,7 @@
 #include "imgui.h"
 #include "imgui_impl_glfw_gl3.h"
 #include <stdio.h>
-#include <GL/gl3w.h>    // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.
+#include "GL/gl3w.h"    // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.
 #include <GLFW/glfw3.h>
 #include <functional>
 
diff --git a/Framework/DebugGUI/src/gl3w.c b/Framework/DebugGUI/src/gl3w.c
@@ -28,7 +28,7 @@
 
 */
 
-#include <GL/gl3w.h>
+#include "GL/gl3w.h"
 #include <stdlib.h>
 
 #define ARRAY_SIZE(x)	(sizeof(x) / sizeof((x)[0]))
diff --git a/Framework/DebugGUI/src/imgui_impl_glfw_gl3.cpp b/Framework/DebugGUI/src/imgui_impl_glfw_gl3.cpp
@@ -10,7 +10,7 @@
 #include "imgui_impl_glfw_gl3.h"
 
 // GL3W/GLFW
-#include <GL/gl3w.h>    // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.
+#include "GL/gl3w.h"    // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.
 #include <GLFW/glfw3.h>
 #ifdef _WIN32
 #undef APIENTRY
