Merge pull request #388 from JeffersonLab/nbrei_gluex_fixes

More small fixes for GlueX
JeffersonLab · Dec 5, 2024 · ef4877d · ef4877d
2 parents e6da892 + 34d66d4
commit ef4877d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/libraries/JANA/Compatibility/JLockService.h b/src/libraries/JANA/Compatibility/JLockService.h
@@ -19,8 +19,6 @@ class JLockService : public JService {
     }
 
     ~JLockService() override {
-        delete m_app_rw_lock;
-        delete m_root_rw_lock;
         for (const auto& pair : m_rw_locks) {
             delete pair.second;
         }
@@ -70,8 +68,8 @@ class JLockService : public JService {
 private:
 
     std::map<std::string, pthread_rwlock_t *> m_rw_locks;
-    pthread_rwlock_t *m_app_rw_lock;
-    pthread_rwlock_t *m_root_rw_lock;
+    pthread_rwlock_t *m_app_rw_lock = nullptr;
+    pthread_rwlock_t *m_root_rw_lock = nullptr;
     pthread_rwlock_t m_rw_locks_lock {}; // control access to rw_locks
     pthread_rwlock_t m_root_fill_locks_lock {}; // control access to m_root_fill_rw_lock
     std::map<JEventProcessor *, pthread_rwlock_t *> m_root_fill_rw_lock;

diff --git a/src/libraries/JANA/JEventSource.h b/src/libraries/JANA/JEventSource.h
@@ -40,7 +40,6 @@ class JEventSource : public jana::components::JComponent,
 
 
 public:
-    [[deprecated]]
     explicit JEventSource(std::string resource_name, JApplication* app = nullptr)
         : m_resource_name(std::move(resource_name)) {
             m_app = app;

diff --git a/src/libraries/JANA/JFactoryT.h b/src/libraries/JANA/JFactoryT.h
@@ -25,7 +25,7 @@ class JFactoryT : public JFactory {
     using IteratorType = typename std::vector<T*>::const_iterator;
     using PairType = std::pair<IteratorType, IteratorType>;
 
-    JFactoryT() : JFactory(JTypeInfo::demangle<T>(), ""){
+    JFactoryT(std::string tag="") : JFactory(JTypeInfo::demangle<T>(), tag){
         EnableGetAs<T>();
         EnableGetAs<JObject>( std::is_convertible<T,JObject>() ); // Automatically add JObject if this can be converted to it
 #if JANA2_HAVE_ROOT