From 8795951bc9a88e70658ec5a67390e270394d385a Mon Sep 17 00:00:00 2001 From: Dominik Drexler Date: Tue, 13 Aug 2024 10:52:15 +0200 Subject: [PATCH] added forward declarations, moved includes to source files --- include/loki/details/pddl/action.hpp | 4 ++-- include/loki/details/pddl/atom.hpp | 4 ++-- include/loki/details/pddl/axiom.hpp | 4 ++-- include/loki/details/pddl/conditions.hpp | 22 ++++++++++++------- include/loki/details/pddl/declarations.hpp | 12 ++++++++++ include/loki/details/pddl/domain.hpp | 5 ++--- include/loki/details/pddl/effects.hpp | 16 +++++++++----- include/loki/details/pddl/function.hpp | 4 ++-- .../details/pddl/function_expressions.hpp | 16 +++++++++----- .../loki/details/pddl/function_skeleton.hpp | 4 ++-- include/loki/details/pddl/literal.hpp | 4 ++-- include/loki/details/pddl/metric.hpp | 4 ++-- include/loki/details/pddl/numeric_fluent.hpp | 4 ++-- include/loki/details/pddl/object.hpp | 4 ++-- include/loki/details/pddl/parameter.hpp | 4 ++-- include/loki/details/pddl/predicate.hpp | 4 ++-- include/loki/details/pddl/problem.hpp | 4 ++-- include/loki/details/pddl/requirements.hpp | 4 ++-- include/loki/details/pddl/term.hpp | 7 +++--- include/loki/details/pddl/type.hpp | 4 ++-- include/loki/details/pddl/variable.hpp | 4 ++-- src/pddl/action.cpp | 1 + src/pddl/atom.cpp | 1 + src/pddl/axiom.cpp | 1 + src/pddl/conditions.cpp | 1 + src/pddl/domain.cpp | 2 ++ src/pddl/effects.cpp | 1 + src/pddl/function.cpp | 1 + src/pddl/function_expressions.cpp | 1 + src/pddl/function_skeleton.cpp | 1 + src/pddl/literal.cpp | 1 + src/pddl/metric.cpp | 1 + src/pddl/numeric_fluent.cpp | 1 + src/pddl/object.cpp | 1 + src/pddl/parameter.cpp | 1 + src/pddl/predicate.cpp | 1 + src/pddl/problem.cpp | 1 + src/pddl/requirements.cpp | 1 + src/pddl/term.cpp | 1 + src/pddl/type.cpp | 1 + src/pddl/variable.cpp | 1 + 41 files changed, 103 insertions(+), 56 deletions(-) diff --git a/include/loki/details/pddl/action.hpp b/include/loki/details/pddl/action.hpp index dea9e882..ebb205c6 100644 --- a/include/loki/details/pddl/action.hpp +++ b/include/loki/details/pddl/action.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include #include @@ -45,7 +44,8 @@ class ActionImpl : public Base std::optional effect); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/atom.hpp b/include/loki/details/pddl/atom.hpp index 33b98a1e..816eb8a3 100644 --- a/include/loki/details/pddl/atom.hpp +++ b/include/loki/details/pddl/atom.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -35,7 +34,8 @@ class AtomImpl : public Base AtomImpl(size_t index, Predicate predicate, TermList terms); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/axiom.hpp b/include/loki/details/pddl/axiom.hpp index 88f7193d..a5984261 100644 --- a/include/loki/details/pddl/axiom.hpp +++ b/include/loki/details/pddl/axiom.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -37,7 +36,8 @@ class AxiomImpl : public Base AxiomImpl(size_t index, std::string derived_predicate_name, ParameterList parameters, Condition condition, size_t num_parameters_to_ground_head); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/conditions.hpp b/include/loki/details/pddl/conditions.hpp index e7098adc..f89e88b5 100644 --- a/include/loki/details/pddl/conditions.hpp +++ b/include/loki/details/pddl/conditions.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -36,7 +35,8 @@ class ConditionLiteralImpl : public Base ConditionLiteralImpl(size_t index, Literal literal); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -68,7 +68,8 @@ class ConditionAndImpl : public Base ConditionAndImpl(size_t index, ConditionList conditions); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -100,7 +101,8 @@ class ConditionOrImpl : public Base ConditionOrImpl(size_t index, ConditionList conditions); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; bool is_structurally_equivalent_to_impl(const ConditionOrImpl& other) const; size_t hash_impl() const; @@ -134,7 +136,8 @@ class ConditionNotImpl : public Base ConditionNotImpl(size_t index, Condition condition); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -167,7 +170,8 @@ class ConditionImplyImpl : public Base ConditionImplyImpl(size_t index, Condition condition_left, Condition condition_right); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -201,7 +205,8 @@ class ConditionExistsImpl : public Base ConditionExistsImpl(size_t index, ParameterList parameters, Condition condition); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -235,7 +240,8 @@ class ConditionForallImpl : public Base ConditionForallImpl(size_t index, ParameterList parameters, Condition condition); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/declarations.hpp b/include/loki/details/pddl/declarations.hpp index 05d5641d..6bb0affe 100644 --- a/include/loki/details/pddl/declarations.hpp +++ b/include/loki/details/pddl/declarations.hpp @@ -33,6 +33,18 @@ namespace loki template using PDDLElement = const T*; +/** + * Utils + */ + +template +struct ShallowHash; +template +struct ShallowEqualTo; + +template +class UniqueFactory; + /** * Domain */ diff --git a/include/loki/details/pddl/domain.hpp b/include/loki/details/pddl/domain.hpp index 0073a1ef..471a3ea8 100644 --- a/include/loki/details/pddl/domain.hpp +++ b/include/loki/details/pddl/domain.hpp @@ -20,9 +20,7 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/pddl/requirements.hpp" #include "loki/details/utils/filesystem.hpp" -#include "loki/details/utils/unique_factory.hpp" #include #include @@ -55,7 +53,8 @@ class DomainImpl : public Base AxiomList axioms); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/effects.hpp b/include/loki/details/pddl/effects.hpp index 5bb31dbc..13e7d78f 100644 --- a/include/loki/details/pddl/effects.hpp +++ b/include/loki/details/pddl/effects.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -47,7 +46,8 @@ class EffectLiteralImpl : public Base EffectLiteralImpl(size_t index, Literal literal); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -79,7 +79,8 @@ class EffectAndImpl : public Base EffectAndImpl(size_t index, EffectList effects); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -113,7 +114,8 @@ class EffectNumericImpl : public Base EffectNumericImpl(size_t index, AssignOperatorEnum assign_operator, Function function, FunctionExpression function_expression); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -148,7 +150,8 @@ class EffectConditionalForallImpl : public Base EffectConditionalForallImpl(size_t index, ParameterList parameters, Effect effect); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -182,7 +185,8 @@ class EffectConditionalWhenImpl : public Base EffectConditionalWhenImpl(size_t index, Condition condition, Effect effect); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/function.hpp b/include/loki/details/pddl/function.hpp index ea3ee23b..b4aba2b8 100644 --- a/include/loki/details/pddl/function.hpp +++ b/include/loki/details/pddl/function.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -35,7 +34,8 @@ class FunctionImpl : public Base FunctionImpl(size_t index, FunctionSkeleton function_skeleton, TermList terms); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/function_expressions.hpp b/include/loki/details/pddl/function_expressions.hpp index 4598d602..dab869ba 100644 --- a/include/loki/details/pddl/function_expressions.hpp +++ b/include/loki/details/pddl/function_expressions.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include #include @@ -56,7 +55,8 @@ class FunctionExpressionNumberImpl : public Base FunctionExpressionNumberImpl(size_t index, double number); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -93,7 +93,8 @@ class FunctionExpressionBinaryOperatorImpl : public Base; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -128,7 +129,8 @@ class FunctionExpressionMultiOperatorImpl : public Base; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -161,7 +163,8 @@ class FunctionExpressionMinusImpl : public Base FunctionExpressionMinusImpl(size_t index, FunctionExpression function_expression); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -193,7 +196,8 @@ class FunctionExpressionFunctionImpl : public Base; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/function_skeleton.hpp b/include/loki/details/pddl/function_skeleton.hpp index 635de068..4eb47306 100644 --- a/include/loki/details/pddl/function_skeleton.hpp +++ b/include/loki/details/pddl/function_skeleton.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -36,7 +35,8 @@ class FunctionSkeletonImpl : public Base FunctionSkeletonImpl(size_t index, std::string name, ParameterList parameters, Type type); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/literal.hpp b/include/loki/details/pddl/literal.hpp index aaa1b5a8..24aa715b 100644 --- a/include/loki/details/pddl/literal.hpp +++ b/include/loki/details/pddl/literal.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -35,7 +34,8 @@ class LiteralImpl : public Base LiteralImpl(size_t index, bool is_negated, Atom atom); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/metric.hpp b/include/loki/details/pddl/metric.hpp index 0e0cb183..20002b07 100644 --- a/include/loki/details/pddl/metric.hpp +++ b/include/loki/details/pddl/metric.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -44,7 +43,8 @@ class OptimizationMetricImpl : public Base OptimizationMetricImpl(size_t index, OptimizationMetricEnum optimization_metric, FunctionExpression function_expression); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/numeric_fluent.hpp b/include/loki/details/pddl/numeric_fluent.hpp index a4712f19..9af54f13 100644 --- a/include/loki/details/pddl/numeric_fluent.hpp +++ b/include/loki/details/pddl/numeric_fluent.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -33,7 +32,8 @@ class NumericFluentImpl : public Base double m_number; // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; NumericFluentImpl(size_t index, Function function, double number); diff --git a/include/loki/details/pddl/object.hpp b/include/loki/details/pddl/object.hpp index 22510bbc..d42a4be2 100644 --- a/include/loki/details/pddl/object.hpp +++ b/include/loki/details/pddl/object.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -35,7 +34,8 @@ class ObjectImpl : public Base ObjectImpl(size_t index, std::string name, TypeList types = {}); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/parameter.hpp b/include/loki/details/pddl/parameter.hpp index 5ac9a166..e35246af 100644 --- a/include/loki/details/pddl/parameter.hpp +++ b/include/loki/details/pddl/parameter.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -36,7 +35,8 @@ class ParameterImpl : public Base ParameterImpl(size_t index, Variable variable, TypeList types); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/predicate.hpp b/include/loki/details/pddl/predicate.hpp index 57ed015e..adf25ba7 100644 --- a/include/loki/details/pddl/predicate.hpp +++ b/include/loki/details/pddl/predicate.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -37,7 +36,8 @@ class PredicateImpl : public Base PredicateImpl(size_t index, std::string name, ParameterList parameters); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/problem.hpp b/include/loki/details/pddl/problem.hpp index c1552f0d..a7953f62 100644 --- a/include/loki/details/pddl/problem.hpp +++ b/include/loki/details/pddl/problem.hpp @@ -21,7 +21,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" #include "loki/details/utils/filesystem.hpp" -#include "loki/details/utils/unique_factory.hpp" #include #include @@ -57,7 +56,8 @@ class ProblemImpl : public Base AxiomList axioms); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/requirements.hpp b/include/loki/details/pddl/requirements.hpp index 937d7770..1b948c1b 100644 --- a/include/loki/details/pddl/requirements.hpp +++ b/include/loki/details/pddl/requirements.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include #include @@ -65,7 +64,8 @@ class RequirementsImpl : public Base RequirementsImpl(size_t index, RequirementEnumSet requirements); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/term.hpp b/include/loki/details/pddl/term.hpp index 783f6de9..3110de84 100644 --- a/include/loki/details/pddl/term.hpp +++ b/include/loki/details/pddl/term.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -37,7 +36,8 @@ class TermObjectImpl : public Base TermObjectImpl(size_t index, Object object); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; @@ -70,7 +70,8 @@ class TermVariableImpl : public Base TermVariableImpl(size_t index, Variable variable); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/type.hpp b/include/loki/details/pddl/type.hpp index 09c96d2e..bee48cca 100644 --- a/include/loki/details/pddl/type.hpp +++ b/include/loki/details/pddl/type.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -35,7 +34,8 @@ class TypeImpl : public Base TypeImpl(size_t index, std::string name, TypeList bases = {}); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/include/loki/details/pddl/variable.hpp b/include/loki/details/pddl/variable.hpp index 9851b39b..c1feb34a 100644 --- a/include/loki/details/pddl/variable.hpp +++ b/include/loki/details/pddl/variable.hpp @@ -20,7 +20,6 @@ #include "loki/details/pddl/base.hpp" #include "loki/details/pddl/declarations.hpp" -#include "loki/details/utils/unique_factory.hpp" #include @@ -34,7 +33,8 @@ class VariableImpl : public Base VariableImpl(size_t index, std::string name); // Give access to the constructor. - friend class UniqueFactory; + template + friend class UniqueFactory; void str_impl(std::ostream& out, const FormattingOptions& options) const; diff --git a/src/pddl/action.cpp b/src/pddl/action.cpp index 7f733a3a..e97df23e 100644 --- a/src/pddl/action.cpp +++ b/src/pddl/action.cpp @@ -22,6 +22,7 @@ #include "loki/details/pddl/parameter.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/atom.cpp b/src/pddl/atom.cpp index 1e45127a..b7326693 100644 --- a/src/pddl/atom.cpp +++ b/src/pddl/atom.cpp @@ -21,6 +21,7 @@ #include "loki/details/pddl/term.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/axiom.cpp b/src/pddl/axiom.cpp index 0fd32ac0..31dbdcd3 100644 --- a/src/pddl/axiom.cpp +++ b/src/pddl/axiom.cpp @@ -24,6 +24,7 @@ #include "loki/details/pddl/predicate.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/conditions.cpp b/src/pddl/conditions.cpp index 6653b247..95a18821 100644 --- a/src/pddl/conditions.cpp +++ b/src/pddl/conditions.cpp @@ -21,6 +21,7 @@ #include "loki/details/pddl/parameter.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/domain.cpp b/src/pddl/domain.cpp index 2b34f5ac..083dffdd 100644 --- a/src/pddl/domain.cpp +++ b/src/pddl/domain.cpp @@ -22,8 +22,10 @@ #include "loki/details/pddl/function_skeleton.hpp" #include "loki/details/pddl/object.hpp" #include "loki/details/pddl/predicate.hpp" +#include "loki/details/pddl/requirements.hpp" #include "loki/details/pddl/type.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/effects.cpp b/src/pddl/effects.cpp index 692c5d30..bacc1e27 100644 --- a/src/pddl/effects.cpp +++ b/src/pddl/effects.cpp @@ -24,6 +24,7 @@ #include "loki/details/pddl/parameter.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/function.cpp b/src/pddl/function.cpp index ac07bd92..728d3454 100644 --- a/src/pddl/function.cpp +++ b/src/pddl/function.cpp @@ -20,6 +20,7 @@ #include "loki/details/pddl/function_skeleton.hpp" #include "loki/details/pddl/term.hpp" #include "loki/details/pddl/visitors.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/function_expressions.cpp b/src/pddl/function_expressions.cpp index 3893f716..5156d8a2 100644 --- a/src/pddl/function_expressions.cpp +++ b/src/pddl/function_expressions.cpp @@ -20,6 +20,7 @@ #include "loki/details/pddl/function.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/function_skeleton.cpp b/src/pddl/function_skeleton.cpp index d4ab9d37..76ddbd9a 100644 --- a/src/pddl/function_skeleton.cpp +++ b/src/pddl/function_skeleton.cpp @@ -19,6 +19,7 @@ #include "loki/details/pddl/parameter.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/literal.cpp b/src/pddl/literal.cpp index df4be322..ab4ef089 100644 --- a/src/pddl/literal.cpp +++ b/src/pddl/literal.cpp @@ -19,6 +19,7 @@ #include "loki/details/pddl/atom.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/metric.cpp b/src/pddl/metric.cpp index e18c21fd..7e89ea33 100644 --- a/src/pddl/metric.cpp +++ b/src/pddl/metric.cpp @@ -20,6 +20,7 @@ #include "loki/details/pddl/function_expressions.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/numeric_fluent.cpp b/src/pddl/numeric_fluent.cpp index 10222026..058f986f 100644 --- a/src/pddl/numeric_fluent.cpp +++ b/src/pddl/numeric_fluent.cpp @@ -18,6 +18,7 @@ #include "loki/details/pddl/numeric_fluent.hpp" #include "loki/details/pddl/function.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/object.cpp b/src/pddl/object.cpp index fb0b7a55..2997c7a3 100644 --- a/src/pddl/object.cpp +++ b/src/pddl/object.cpp @@ -19,6 +19,7 @@ #include "loki/details/pddl/type.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/parameter.cpp b/src/pddl/parameter.cpp index b592bf9c..d06c68c7 100644 --- a/src/pddl/parameter.cpp +++ b/src/pddl/parameter.cpp @@ -20,6 +20,7 @@ #include "loki/details/pddl/type.hpp" #include "loki/details/pddl/variable.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/predicate.cpp b/src/pddl/predicate.cpp index c2367e51..22c664c3 100644 --- a/src/pddl/predicate.cpp +++ b/src/pddl/predicate.cpp @@ -21,6 +21,7 @@ #include "loki/details/pddl/type.hpp" #include "loki/details/pddl/variable.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/problem.cpp b/src/pddl/problem.cpp index c33d77a9..72de3e54 100644 --- a/src/pddl/problem.cpp +++ b/src/pddl/problem.cpp @@ -29,6 +29,7 @@ #include "loki/details/pddl/type.hpp" #include "loki/details/pddl/visitors.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/requirements.cpp b/src/pddl/requirements.cpp index a3da2ea3..9f94b261 100644 --- a/src/pddl/requirements.cpp +++ b/src/pddl/requirements.cpp @@ -17,6 +17,7 @@ #include "loki/details/pddl/requirements.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" #include diff --git a/src/pddl/term.cpp b/src/pddl/term.cpp index 8c88e0ee..577a3963 100644 --- a/src/pddl/term.cpp +++ b/src/pddl/term.cpp @@ -20,6 +20,7 @@ #include "loki/details/pddl/object.hpp" #include "loki/details/pddl/variable.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/type.cpp b/src/pddl/type.cpp index 728f08ea..d769117c 100644 --- a/src/pddl/type.cpp +++ b/src/pddl/type.cpp @@ -18,6 +18,7 @@ #include "loki/details/pddl/type.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki diff --git a/src/pddl/variable.cpp b/src/pddl/variable.cpp index abc9adbf..88d2977f 100644 --- a/src/pddl/variable.cpp +++ b/src/pddl/variable.cpp @@ -23,6 +23,7 @@ #include "loki/details/pddl/parameter.hpp" #include "loki/details/pddl/term.hpp" #include "loki/details/utils/collections.hpp" +#include "loki/details/utils/equal_to.hpp" #include "loki/details/utils/hash.hpp" namespace loki