Skip to content
Permalink
Browse files
Changes necessary to build in F24 with GCC6 (std-c++14).
  • Loading branch information
Ben Hilburn committed Jul 27, 2016
1 parent cfea23b commit 13e7bf2b6a18137695582195739cb955e64b3006
@@ -141,7 +141,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 " << prfFile<< ". " << parser_error_line << "The XML parser returned the following error: " << ex.what());
exit(EXIT_FAILURE);
}
prfStream.close();
@@ -194,7 +194,7 @@ void ApplicationFactory_impl::ValidateSPD(CF::FileManager_ptr fileMgr,
const bool require_prf,
const bool require_scd) {
SoftPkg pkg;
ValidateSPD(fileMgr, pkg, false, false );
ValidateSPD(fileMgr, pkg, sfw_profile, require_prf, require_scd);
}

void ApplicationFactory_impl::ValidateSPD(CF::FileManager_ptr fileMgr,
@@ -853,7 +853,7 @@ const bool ComponentInfo::isScaCompliant()

bool ComponentInfo::isAssignedToDevice() const
{
return assignedDevice;
return static_cast<bool>(assignedDevice);
}

bool ComponentInfo::checkStruct(CF::Properties &props)
@@ -28,7 +28,7 @@ class CppTestDevice_i : public CppTestDevice_base
{
ENABLE_LOGGING
public:
static const float MAX_LOAD = 4.0;
static constexpr float MAX_LOAD = 4.0;

CppTestDevice_i(char *devMgr_ior, char *id, char *lbl, char *sftwrPrfl);
CppTestDevice_i(char *devMgr_ior, char *id, char *lbl, char *sftwrPrfl, char *compDev);

0 comments on commit 13e7bf2

Please sign in to comment.