Fix boost and other compiler warnings

DDCore/include/JSON/DocumentHandler.h

@@ -14,7 +14,7 @@
 #define JSON_DOCUMENTHANDLER_H
 
 /// Framework include files
-#include "JSON/Elements.h"
+#include <JSON/Elements.h>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {

DDCore/include/JSON/Elements.h

@@ -20,7 +20,7 @@
 #include <stdexcept>
 
 // Framework include files
-#include "JSON/config.h"
+#include <JSON/config.h>
 
 #ifndef RAD_2_DEGREE
 #define RAD_2_DEGREE 57.295779513082320876798154814105

DDCore/include/JSON/config.h

@@ -17,7 +17,8 @@
 
 #define DD4HEP_USE_BOOST_JSON 1
 
-#include "boost/property_tree/ptree.hpp"
+#include <boost/bind/bind.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {

DDCore/src/JSON/DocumentHandler.cpp

@@ -12,10 +12,12 @@
 //==========================================================================
 
 // Framework include files
-#include "JSON/DocumentHandler.h"
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#include <JSON/Helper.h>
+#include <JSON/DocumentHandler.h>
 
 // C/C++ include files
-#include "boost/property_tree/json_parser.hpp"
+#include <boost/property_tree/json_parser.hpp>
 #include <memory>
 #include <stdexcept>
 

DDCore/src/plugins/JsonProcessor.cpp

@@ -26,19 +26,20 @@
 */
 
 // Framework inlcude files
-#include "JSON/Helper.h"
-#include "JSON/DocumentHandler.h"
-#include "JSON/Conversions.h"
-#include "DD4hep/Plugins.h"
-#include "DD4hep/Printout.h"
-#include "DD4hep/IDDescriptor.h"
-#include "DD4hep/detail/SegmentationsInterna.h"
-#include "DD4hep/detail/DetectorInterna.h"
-#include "DD4hep/detail/ObjectsInterna.h"
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#include <JSON/Helper.h>
+#include <JSON/DocumentHandler.h>
+#include <JSON/Conversions.h>
+#include <DD4hep/Plugins.h>
+#include <DD4hep/Printout.h>
+#include <DD4hep/IDDescriptor.h>
+#include <DD4hep/detail/SegmentationsInterna.h>
+#include <DD4hep/detail/DetectorInterna.h>
+#include <DD4hep/detail/ObjectsInterna.h>
 
 // C/C++ include files
 #include <iostream>
-#include "boost/property_tree/json_parser.hpp"
+#include <boost/property_tree/json_parser.hpp>
 
 namespace {
   class Json;

DDG4/include/DDG4/Geant4FastSimHandler.h

@@ -48,7 +48,7 @@ namespace dd4hep {
       Geant4FastSimHandler() = delete;
       /// Initializing constructor
       Geant4FastSimHandler(const Geant4FastSimSpot* sp)
-	: Geant4HitHandler(sp->primary, sp->touchable), spot(sp)
+        : Geant4HitHandler(sp->primary, sp->touchable), spot(sp)
       {
       }
       /// No copy constructor
@@ -61,7 +61,7 @@ namespace dd4hep {
       Geant4FastSimHandler& operator=(Geant4FastSimHandler&& copy) = delete;
       /// Returns total energy deposit
       double energy() const  {
-	return spot->hit->GetEnergy();
+        return spot->hit->GetEnergy();
       }
       /// Return track momentum in DD4hep notation
       Momentum momentum() const {
@@ -84,14 +84,14 @@ namespace dd4hep {
       }
       /// Returns the track momentum as a G4ThreeVector
       G4ThreeVector momentumG4() const {
-	return track->GetMomentum();
+        return track->GetMomentum();
       }
       /// Access the enery deposit of the energy spot
       double deposit() const  {
         return spot->hit->GetEnergy();
       }
       G4VPhysicalVolume* volume() const {
-	return touchable()->GetVolume();
+        return touchable()->GetVolume();
       }
       G4LogicalVolume* logvol() const {
         return volume()->GetLogicalVolume();
@@ -103,12 +103,12 @@ namespace dd4hep {
         G4LogicalVolume* lv = logvol();
         return lv ? lv->GetSensitiveDetector() : 0;
       }
-      const char* sdName(const char* undefined = "") const {
+      std::string sdName(const std::string& undefined = "") const {
         G4VSensitiveDetector* s = sd();
-        return s ? s->GetName().c_str() : undefined;
+        return s ? s->GetName() : undefined;
       }
       bool isSensitive() const {
-	G4LogicalVolume* lv = logvol();
+        G4LogicalVolume* lv = logvol();
         return lv ? (0 != lv->GetSensitiveDetector()) : false;
       }
     };

DDG4/include/DDG4/Geant4StepHandler.h

@@ -165,7 +165,7 @@ namespace dd4hep {
         G4LogicalVolume* lv = logvol(p);
         return lv ? lv->GetSensitiveDetector() : 0;
       }
-      const char* sdName(const G4StepPoint* p, const char* undefined = "") const {
+      std::string sdName(const G4StepPoint* p, const std::string& undefined = "") const {
         G4VSensitiveDetector* s = sd(p);
         return s ? s->GetName().c_str() : undefined;
       }

DDTest/src/test_PolarGridRPhi2.cc

@@ -112,9 +112,9 @@ int main() {
 
       dd4hep::DDSegmentation::CellID cid = seg.cellID(locPos, globPos, volID);
 
-      const long long phiShifted(pB << phiBitOffset);
-      const long long rShifted  (rB << rBitOffset);
-      const long long expectedID(rShifted + phiShifted);
+      const dd4hep::FieldID phiShifted(pB << phiBitOffset);
+      const dd4hep::FieldID rShifted  (rB << rBitOffset);
+      const dd4hep::CellID  expectedID(rShifted + phiShifted);
 
       test( expectedID , cid , " Test get ID From Position" );