Fix compiler warnings

iLCSoft · Nov 26, 2023 · c275032 · c275032
1 parent 90c5ecc
commit c275032
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/source/include/lccd/DBFileHandler.hh b/source/include/lccd/DBFileHandler.hh
@@ -4,8 +4,6 @@
 //#include "lccd.h"
 #include "ConditionsHandlerBase.hh"
 
-using namespace lcio ;
-
 namespace lccd {
 
 

diff --git a/source/include/lccd/DataFileHandler.hh b/source/include/lccd/DataFileHandler.hh
@@ -4,8 +4,6 @@
 //#include "lccd.h"
 #include "ConditionsHandlerBase.hh"
 
-using namespace lcio ;
-
 namespace lccd {
 
   /** Implementation of ConditionsHandlerBase that handles conditions data 

diff --git a/source/include/lccd/SimpleFileHandler.hh b/source/include/lccd/SimpleFileHandler.hh
@@ -4,8 +4,6 @@
 //#include "lccd.h"
 #include "ConditionsHandlerBase.hh"
 
-using namespace lcio ;
-
 namespace lccd {
 
   /** Implementation of ConditionsHandlerBase that reads the conditions data 

diff --git a/source/include/lccd_exceptions.h b/source/include/lccd_exceptions.h
@@ -24,13 +24,13 @@ namespace lccd{
     LCCDException(){  /*no_op*/ ; } 
 
   public: 
-    virtual ~LCCDException() throw() { /*no_op*/; } 
+    virtual ~LCCDException() noexcept { /*no_op*/; }
 
     LCCDException( const std::string& text ) {
       message = "lccd::Exception: " + text ;
     }
 
-    virtual const char* what() const  throw() { return  message.c_str() ; }
+    virtual const char* what() const noexcept { return  message.c_str() ; }
   }; 
 
   /**DatabaseException used for errors accessing the database data.
@@ -42,7 +42,7 @@ namespace lccd{
   protected:
     DatabaseException() {  /*no_op*/ ; } 
   public: 
-    virtual ~DatabaseException() throw() { /*no_op*/; } 
+    virtual ~DatabaseException() noexcept { /*no_op*/; }
 
     DatabaseException( std::string text ){
       message = "lccd::DatabaseException: " + text ;
@@ -56,7 +56,7 @@ namespace lccd{
   class DataNotAvailableException : public LCCDException{
 
   public: 
-    virtual ~DataNotAvailableException() throw() { /*no_op*/; } 
+    virtual ~DataNotAvailableException() noexcept { /*no_op*/; }
 
     DataNotAvailableException( std::string text ) {
       message = "lccd::DataNotAvailableException: " + text ;
@@ -70,7 +70,7 @@ namespace lccd{
   class ReadOnlyException : public LCCDException{
 
   public: 
-    virtual ~ReadOnlyException() throw() { /*no_op*/; } 
+    virtual ~ReadOnlyException() noexcept { /*no_op*/; }
 
     ReadOnlyException( std::string text ){
       message = "lccd::ReadOnlyException: " + text ;
@@ -84,7 +84,7 @@ namespace lccd{
   class InconsistencyException : public LCCDException{
 
   public: 
-    virtual ~InconsistencyException() throw() { /*no_op*/; } 
+    virtual ~InconsistencyException() noexcept { /*no_op*/; }
 
     InconsistencyException( std::string text ) {
       message = "lccd::InconsistencyException: " + text ;
@@ -98,7 +98,7 @@ namespace lccd{
   class MemberNotImplementedException : public LCCDException{
 
   public: 
-    virtual ~MemberNotImplementedException() throw() { /*no_op*/; } 
+    virtual ~MemberNotImplementedException() noexcept { /*no_op*/; }
 
     MemberNotImplementedException( std::string text ) {
       message = "lccd::MemberNotImplementedException: " + text ;

diff --git a/source/test/CalibrationConstant.hh b/source/test/CalibrationConstant.hh
@@ -12,8 +12,6 @@
 #define OFFSET_INDEX 0
 #define GAIN_INDEX 1
 
-using namespace lcio ;
-
 class CalibrationConstant ;
 
 /** Example for a simple calibration class based on the LCFixedObject template.
@@ -23,7 +21,7 @@ class CalibrationConstant ;
  *  for copying it  to some local structure (Decorator pattern).<br>
  *  
  */
-class CalibrationConstant : public LCFixedObject<NINT,NFLOAT,NDOUBLE> {
+class CalibrationConstant : public lcio::LCFixedObject<NINT,NFLOAT,NDOUBLE> {
 
 public: 
 

diff --git a/source/test/readdatafile.cc b/source/test/readdatafile.cc
@@ -49,7 +49,6 @@ int main(int argc, char** argv ) {
   lcReader->open( fileName ) ;
 
   LCEvent* evt ;
-  int nEvents = 0 ;
 
   //----------- the event loop -----------
   while( (evt = lcReader->readNextEvent()) != 0 ) {
@@ -58,7 +57,6 @@ int main(int argc, char** argv ) {
 
     LCTOOLS::dumpEvent( evt ) ;
 
-    nEvents ++ ;
   }
   // -------- end of event loop -----------