From 8bbf1c3d0dca6360d83fd00a759ea751aaee4ec2 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 14 Sep 2016 16:39:43 +0200 Subject: [PATCH] Change arrangement of optional and help text arguments --- include/openspace/documentation/documentation.h | 4 ++-- src/documentation/documentation.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h index 8ad21d5d30..f8d86556e1 100644 --- a/include/openspace/documentation/documentation.h +++ b/include/openspace/documentation/documentation.h @@ -56,8 +56,8 @@ struct Verifier { }; struct DocumentationEntry { - DocumentationEntry(std::string key, Verifier* t, Optional optional = Optional::No, - std::string doc = ""); + DocumentationEntry(std::string key, Verifier* t, std::string doc = "", + Optional optional = Optional::No); std::string key; std::shared_ptr tester; diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp index 83c9fc3c27..25cba94fca 100644 --- a/src/documentation/documentation.cpp +++ b/src/documentation/documentation.cpp @@ -93,12 +93,13 @@ bool Verifier::test(const ghoul::Dictionary& dict, const std::string& key) const return false; }; -DocumentationEntry::DocumentationEntry(std::string key, Verifier* t, - Optional optional, std::string doc) +DocumentationEntry::DocumentationEntry(std::string key, Verifier* t, std::string doc, + Optional optional) : key(std::move(key)) , tester(std::move(t)) + , documentation(std::move(doc)) , optional(optional) - , documentation(std::move(doc)) {} +{} TestResult testSpecification(const Documentation& d, const ghoul::Dictionary& dictionary){ TestResult result;