Skip to content
Snippets Groups Projects

Fix compatibility with Boost 1.81

Merged Marco Clemencic requested to merge clemenci-master-patch-87173 into master
All threads resolved!
2 files
+ 5
5
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -49,7 +49,7 @@ fs::path ConfigFileAccessSvc::dir() const {
}
m_dir = def;
}
return fs::path( m_dir );
return fs::path( m_dir.value() );
}
fs::path ConfigFileAccessSvc::propertyConfigPath( const PropertyConfig::digest_type& digest ) const {
@@ -113,7 +113,7 @@ PropertyConfig::digest_type ConfigFileAccessSvc::writePropertyConfig( const Prop
PropertyConfig::digest_type digest = config.digest();
fs::path fnam = propertyConfigPath( digest );
fs::path fdir = fnam.branch_path();
fs::path fdir = fnam.parent_path();
if ( !fs::exists( fdir ) && !create_directories( fdir ) ) {
error() << " directory " << fdir.string() << " does not exist, and could not create... " << endmsg;
return PropertyConfig::digest_type::createInvalid();
@@ -138,7 +138,7 @@ ConfigTreeNode::digest_type ConfigFileAccessSvc::writeConfigTreeNode( const Conf
ConfigTreeNode::digest_type digest = config.digest();
fs::path fnam = configTreeNodePath( digest );
fs::path fdir = fnam.branch_path();
fs::path fdir = fnam.parent_path();
if ( !fs::exists( fdir ) && !create_directories( fdir ) ) {
error() << " directory " << fdir.string() << " does not exist, and could not create... " << endmsg;
return ConfigTreeNode::digest_type::createInvalid();
@@ -174,7 +174,7 @@ ConfigTreeNodeAlias::alias_type ConfigFileAccessSvc::writeConfigTreeNodeAlias( c
}
// now write alias...
fs::path fnam = configTreeNodeAliasPath( alias.alias() );
fs::path fdir = fnam.branch_path();
fs::path fdir = fnam.parent_path();
if ( fs::exists( fdir ) ) {
if ( !isCompatible( alias, fdir ) ) {
error() << " current TOPLEVEL is not compatible with other config in " << fdir.string()
Loading