Merge changes I4d4f2d49,I472c0b32,Iefc31f83
* changes:
Allow usage of search dirs in YangSchema
Rename fillMap and move it for reuse
Get rid of std::filesystem linking
diff --git a/src/data_query.cpp b/src/data_query.cpp
index cef7ec3..e231ac3 100644
--- a/src/data_query.cpp
+++ b/src/data_query.cpp
@@ -6,8 +6,8 @@
DataQuery::DataQuery(DatastoreAccess& datastore)
: m_datastore(datastore)
+ , m_schema(m_datastore.schema())
{
- m_schema = m_datastore.schema();
}
std::vector<ListInstance> DataQuery::listKeys(const dataPath_& listPath) const
diff --git a/src/parser.cpp b/src/parser.cpp
index 195789b..5efee6b 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -19,8 +19,8 @@
Parser::Parser(const std::shared_ptr<const Schema> schema, const std::shared_ptr<const DataQuery> dataQuery)
: m_schema(schema)
, m_dataquery(dataQuery)
+ , m_curDir({Scope::Absolute, {}})
{
- m_curDir.m_scope = Scope::Absolute;
}
bool Completions::operator==(const Completions& b) const