Repository navigation
build errors with g++ (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0 #20
Copy link
Copy link
Open
Description
ClausKlein
opened on Nov 19, 2021
Issue body actions
Reactions are currently unavailable
Activity
this patch helps:
$ git diff control/ diff --git a/redhawk/src/control/framework/nodebooter.cpp b/redhawk/src/control/framework/nodebooter.cpp index c61fb2cf..8d756ff4 100644 --- a/redhawk/src/control/framework/nodebooter.cpp +++ b/redhawk/src/control/framework/nodebooter.cpp @@ -143,7 +143,7 @@ void loadPRFExecParams (const std::string& prfFile, ExecParams& execParams) prf.load(prfStream); } catch (const ossie::parser_error& ex) { std::string parser_error_line = ossie::retrieveParserErrorLineNumber(ex.what()); - LOG_ERROR(nodebooter, "Failed to parse PRF file " << prfStream<< ". " << parser_error_line << "The XML parser returned the following error: " << ex.what()); + LOG_ERROR(nodebooter, "Failed to parse PRF file " << prfStream.rdbuf() << ". " << parser_error_line << "The XML parser returned the following error: " << ex.what()); exit(EXIT_FAILURE); } prfStream.close(); diff --git a/redhawk/src/control/sdr/dommgr/ApplicationFactory_impl.cpp b/redhawk/src/control/sdr/dommgr/ApplicationFactory_impl.cpp index 9ca373a7..d596e54e 100644 --- a/redhawk/src/control/sdr/dommgr/ApplicationFactory_impl.cpp +++ b/redhawk/src/control/sdr/dommgr/ApplicationFactory_impl.cpp @@ -2112,7 +2112,7 @@ void createHelper::loadAndExecuteContainers(const ContainerList& containers, std::ostringstream message; message << "container " << container->getIdentifier() << " was assigned to non-loadable device " << device->identifier; - RH_ERROR(_createHelperLog, message); + RH_ERROR(_createHelperLog, message.str()); throw std::logic_error(message.str()); } @@ -2199,7 +2199,7 @@ void createHelper::loadAndExecuteComponents(const ComponentList& deployments, std::ostringstream message; message << "component " << component_id << " was assigned to non-loadable device " << device->identifier; - RH_ERROR(_createHelperLog, message); + RH_ERROR(_createHelperLog, message.str()); throw std::logic_error(message.str()); } @@ -2282,7 +2282,7 @@ void createHelper::loadAndExecuteShared(const ComponentList& deployments, const std::ostringstream message; message << "component " << component_id << " was assigned to non-loadable device " << device->identifier; - RH_ERROR(_createHelperLog, message); + RH_ERROR(_createHelperLog, message.str()); throw std::logic_error(message.str()); } diff --git a/redhawk/src/testing/sdr/dev/devices/GPP/cpp/GPP.cpp b/redhawk/src/testing/sdr/dev/devices/GPP/cpp/GPP.cpp index c4dfa784..cf4846e5 100644 --- a/redhawk/src/testing/sdr/dev/devices/GPP/cpp/GPP.cpp +++ b/redhawk/src/testing/sdr/dev/devices/GPP/cpp/GPP.cpp @@ -604,7 +604,7 @@ void GPP_i::update_grp_child_pids() { } catch ( ... ) { std::stringstream errstr; - errstr << "Unable to read "<<stat_filename<<". The process is no longer there"; + errstr << "Unable to read "<<stat_filename.str()<<". The process is no longer there"; LOG_DEBUG(GPP_i, __FUNCTION__ << ": " << errstr.str() ); continue; } @@ -1745,8 +1745,7 @@ void GPP_i::set_resource_affinity( const CF::Properties& options, const pid_t rs { RH_DEBUG( redhawk::affinity::get_affinity_logger(), "Affinity Options....GPP/Resource: " << label() << "/" << rsc_name << " options" << options.length() ); - boost::recursive_mutex::scoped_lock(load_execute_lock); - + boost::recursive_mutex::scoped_lock lock(load_execute_lock); // check if we override incoming affinity requests... if ( affinity.force_override ) { $
see too #22
Metadata
Metadata
Assignees
Labels
No labels