Skip to content
Snippets Groups Projects

Add vcpkg support

Merged Joscha Schmiedt requested to merge f-test-vcpkg into dev
All threads resolved!
1 file
+ 3
3
Compare changes
  • Side-by-side
  • Inline
@@ -55,7 +55,7 @@
throw ConfigurationError("This CaosDB client has not been configured."); \
} \
assert(WRAPPED_JSON_CONFIGURATION(this)->is_object()); \
const auto &configuration = WRAPPED_JSON_CONFIGURATION(this)->as_object(); \
const auto &configuration = WRAPPED_JSON_CONFIGURATION(this) -> as_object(); \
if (!configuration.contains("connections")) { \
throw ConfigurationError("This CaosDB client hasn't any configured connections."); \
} \
@@ -343,7 +343,7 @@ auto CreateLoggingConfiguration(const object &from) -> LoggingConfiguration {
const auto *elem = sinks.begin();
while (elem != sinks.end()) {
result.AddSink(CreateSinkConfiguration(elem->value().as_object(), elem->key().to_string(),
result.AddSink(CreateSinkConfiguration(elem->value().as_object(), std::string(elem->key()),
default_level));
elem = std::next(elem);
}
@@ -419,7 +419,7 @@ auto ConfigurationManager::mGetDefaultConnectionName() const -> std::string {
}
if (connections.size() == 1) {
// return the key of the first and only sub-element of connections.
return connections.begin()->key().to_string();
return std::string(connections.begin()->key());
}
throw ConfigurationError("Could not determine the default connection.");
}
Loading