Merge branch 'release/v09_17_09'

miquelnebot · miquelnebot · commit 9fe95ba596e4 · 2023-11-15T17:41:43.000-06:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(sbnobj VERSION 09.17.08 LANGUAGES CXX)
+project(sbnobj VERSION 09.17.09 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="
diff --git a/sbnobj/Common/Calibration/TrackCaloSkimmerObj.h b/sbnobj/Common/Calibration/TrackCaloSkimmerObj.h
@@ -2,6 +2,7 @@
 #define SBN_TrackCaloSkimmerObj
 
 #include <climits>
+#include <limits> // for std::numeric_limits
 
 #include <vector>
 
diff --git a/sbnobj/Common/PMT/Data/V1730channelConfiguration.h b/sbnobj/Common/PMT/Data/V1730channelConfiguration.h
@@ -10,6 +10,7 @@
 #define SBNOBJ_COMMON_PMT_DATA_V1730CHANNELCONFIGURATION_H
 
 // LArSoft libraries
+#include <cstdint>  // uint16_t in OpDetWaveform.h
 #include "lardataobj/RawData/OpDetWaveform.h" // raw::Channel_t
 
 // C/C++ standard libraries
diff --git a/sbnobj/Common/Reco/MVAPID.cc b/sbnobj/Common/Reco/MVAPID.cc
@@ -4,6 +4,7 @@
 #include "messagefacility/MessageLogger/MessageLogger.h"
 
 #include <algorithm>
+#include <limits> // for std::numeric_limits
 
 void sbn::MVAPID::AddScore(int pdg, float score)
 {
diff --git a/sbnobj/ICARUS/PMT/Trigger/Data/TriggerGateData.tcc b/sbnobj/ICARUS/PMT/Trigger/Data/TriggerGateData.tcc
@@ -428,7 +428,8 @@ auto icarus::trigger::TriggerGateData<TK, TI>::SymmetricCombination(
     struct GateStatus_t {
       // protecting against Clang bug 33298 (at least until Clang 8)
       // (https://bugs.llvm.org/show_bug.cgi?id=33298)
-#if defined(__clang__) && (__clang_major__ < 9)
+// both c7 and c14 complain 
+#if defined(__clang__) 
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif // __clang_major__ < 9
diff --git a/sbnobj/SBND/Timing/DAQTimestamp.hh b/sbnobj/SBND/Timing/DAQTimestamp.hh
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <string>
 #include <array>
+#include <limits> // for std::numeric_limits
 
 namespace sbnd::timing {
 
diff --git a/ups/product_deps b/ups/product_deps
@@ -87,7 +87,7 @@
 #>  define_pythonpath
 ####################################
 parent		sbnobj
-defaultqual	e20
+defaultqual	e26
 ####################################
 
 ####################################
@@ -246,7 +246,7 @@ defaultqual	e20
 #
 ####################################
 product		version		qual	flags		<table_format=2>
-lardataobj	v09_16_02	-
+lardataobj	v09_16_03	-
 cetmodules	v3_21_01	-	only_for_build
 end_product_list
 ####################################
@@ -303,8 +303,12 @@ end_product_list
 #
 ####################################
 qualifier	lardataobj	notes
+c14:debug	c14:debug
+c14:prof	c14:prof
 c7:debug	c7:debug
 c7:prof		c7:prof
+e26:debug	e26:debug
+e26:prof	e26:prof
 e20:debug	e20:debug
 e20:prof	e20:prof
 end_qualifier_list

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#include "messagefacility/MessageLogger/MessageLogger.h"`
`5`	`5`
`6`	`6`	`#include <algorithm>`
	`7`	`+#include <limits> // for std::numeric_limits`
`7`	`8`
`8`	`9`	`void sbn::MVAPID::AddScore(int pdg, float score)`
`9`	`10`	`{`