Merge pull request #83 from art-daq/eflumerf/e28_fixes

Changes needed by GCC 13.1
art-daq · Jun 1, 2023 · 5061d7b · 5061d7b
2 parents c546747 + 99cfa17
commit 5061d7b
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 1,261 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -139,10 +139,6 @@ cet_register_export_set(SET_NAME otsdaqUsers SET_DEFAULT)
 # tools
 add_subdirectory(tools)
 
-# tools
-FILE(COPY tools DESTINATION .)
-INSTALL(DIRECTORY tools DESTINATION ./${product}/${version})
-
 # Documentation (to comment out if not needed DOXYGEN locally)
 if( $ENV{OTS_DOXY} MATCHES "DOIT" )
 	add_subdirectory(doc)
@@ -151,12 +147,9 @@ endif()
 # test programs
 add_subdirectory(test)
 
-# test
-FILE(COPY test DESTINATION .)
-INSTALL(DIRECTORY test DESTINATION ./${product}/${version})
 
 # data-core
 FILE(COPY data-core DESTINATION .)
-INSTALL(DIRECTORY data-core DESTINATION ./${product}/${version})
+INSTALL(DIRECTORY data-core DESTINATION .)
 
 cet_cmake_config()
diff --git a/otsdaq/ARTDAQOnlineMonitor/ARTDAQOnlineMonitorSupervisor.cc b/otsdaq/ARTDAQOnlineMonitor/ARTDAQOnlineMonitorSupervisor.cc
@@ -389,7 +389,7 @@ void ots::ARTDAQOnlineMonitorSupervisor::StartArtProcess(const std::string& conf
 	auto startTime = std::chrono::steady_clock::now();
 
 	art_pid_ = std::shared_ptr<std::atomic<pid_t>>(new std::atomic<pid_t>(-1));
-	boost::thread thread([=] { RunArt(config_file, art_pid_); });
+	boost::thread thread([this,config_file] { RunArt(config_file, art_pid_); });
 	thread.detach();
 
 	while((*art_pid_ <= 0) && (artdaq::TimeUtils::GetElapsedTime(startTime) < 5))

diff --git a/otsdaq/ARTDAQSupervisor/ARTDAQSupervisor.cc b/otsdaq/ARTDAQSupervisor/ARTDAQSupervisor.cc
@@ -432,7 +432,7 @@ void ARTDAQSupervisor::transitionConfiguring(toolbox::Event::Reference /*event*/
 void ARTDAQSupervisor::configuringThread()
 try
 {
-	const std::string& uid =
+	std::string uid =
 	    theConfigurationManager_
 	        ->getNode(ConfigurationManager::XDAQ_APPLICATION_TABLE_NAME + "/" + CorePropertySupervisorBase::getSupervisorUID() + "/" + "LinkToSupervisorTable")
 	        .getValueAsString();
@@ -1020,7 +1020,7 @@ catch(...)
 void ARTDAQSupervisor::startingThread()
 try
 {
-	const std::string& uid =
+	std::string uid =
 	    theConfigurationManager_
 	        ->getNode(ConfigurationManager::XDAQ_APPLICATION_TABLE_NAME + "/" + CorePropertySupervisorBase::getSupervisorUID() + "/" + "LinkToSupervisorTable")
 	        .getValueAsString();

diff --git a/otsdaq/CgiDataUtilities/CgiDataUtilities.cc b/otsdaq/CgiDataUtilities/CgiDataUtilities.cc
@@ -36,7 +36,7 @@ std::string CgiDataUtilities::postData(cgicc::Cgicc& cgi, const std::string& nee
 	start_pos += needle.length() + 2;         // get past & and field
 	end_pos = postData.find('&', start_pos);  // skip needle and = sign
 	if(end_pos == std::string::npos)
-		postData.length();  // not found, so take data to end
+		end_pos = postData.length();  // not found, so take data to end
 
 	//__COUT__ << "start_pos=" << start_pos
 	//		<< "end_pos=" << end_pos << std::endl;

diff --git a/otsdaq/NetworkUtilities/TCPPacket.h b/otsdaq/NetworkUtilities/TCPPacket.h
@@ -1,6 +1,7 @@
 #ifndef _ots_TCPPacket_h_
 #define _ots_TCPPacket_h_
 
+#include <cstdint>
 #include <string>
 
 namespace ots

diff --git a/otsdaq/NetworkUtilities/TCPTransmitterSocket.h b/otsdaq/NetworkUtilities/TCPTransmitterSocket.h
@@ -1,10 +1,12 @@
 #ifndef _ots_TCPTransmitterSocket_h_
 #define _ots_TCPTransmitterSocket_h_
 
+#include "otsdaq/NetworkUtilities/TCPSocket.h"
+
+#include <cstdint>
 #include <iostream>
 #include <string>
 #include <vector>
-#include "otsdaq/NetworkUtilities/TCPSocket.h"
 
 namespace ots
 {

diff --git a/otsdaq/TableCore/TableView.cc b/otsdaq/TableCore/TableView.cc
@@ -1908,7 +1908,7 @@ void TableView::reset(void)
 {
 	version_ = -1;
 	comment_ = "";
-	author_ + "";
+	author_ = "";
 	columnsInfo_.clear();
 	theDataView_.clear();
 }  // end reset()

diff --git a/otsdaq/WorkLoopManager/WorkLoopManager.h b/otsdaq/WorkLoopManager/WorkLoopManager.h
@@ -45,14 +45,8 @@ class WorkLoopManager
 
   private:
 	const std::string cWorkLoopType_;
-	enum
-	{
-		maxWorkLoops = 5
-	};
-	enum
-	{
-		timeOutInSeconds = 20
-	};
+	static constexpr int maxWorkLoops = 5;
+	static constexpr int     timeOutInSeconds = 20;
 	struct WorkLoopStruct
 	{
 		toolbox::task::WorkLoop* workLoop;

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1,16 +1,11 @@
 
-include(CetTest)
-cet_enable_asserts()
-
-#cet_make_exec(otsdaq_flatten_active_to_version)
+cet_make_exec(NAME otsdaq_fix_new_table_fields_tool LIBRARIES otsdaq::ConfigurationInterface)
 cet_make_exec(NAME otsdaq_flatten_system_aliases LIBRARIES otsdaq::ConfigurationInterface)
 cet_make_exec(NAME otsdaq_import_system_aliases LIBRARIES otsdaq::ConfigurationInterface)
-cet_make_exec(NAME otsdaq_fix_new_table_fields_tool LIBRARIES otsdaq::ConfigurationInterface)
 
-cet_script(ALWAYS_COPY ots common.sh ots_remote_start otsdaq_convert_config_to_table otsdaq_convert_artdaq_daq_tables otsdaq_beautify_artdaq_tables otsdaq_add_artdaq_tables vless_ots.sh vtail_ots.sh)
-# cet_script(ALWAYS_COPY redmine_login.sh reset_ots_snapshot.sh )
+cet_script(ALWAYS_COPY common.sh EclipseBuild.sh ots otsdaq_add_artdaq_tables otsdaq_beautify_artdaq_tables otsdaq_convert_artdaq_daq_tables otsdaq_convert_config_to_table otsweb_login.sh ots_remote_start redmine_login.sh reset_ots_snapshot.sh StartOTS.sh vless_ots.sh vtail_ots.sh xt_cmd.sh)
 
+install_fhicl(SUBDIRS fcl)
 install_headers()
 install_source()
-install_fhicl(SUBDIRS fcl)