diff options
Diffstat (limited to 'include/ingen/Properties.hpp')
| -rw-r--r-- | include/ingen/Properties.hpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/include/ingen/Properties.hpp b/include/ingen/Properties.hpp index 1a80d0af..5f953902 100644 --- a/include/ingen/Properties.hpp +++ b/include/ingen/Properties.hpp @@ -17,9 +17,9 @@ #ifndef INGEN_PROPERTIES_HPP #define INGEN_PROPERTIES_HPP -#include "ingen/Atom.hpp" -#include "ingen/URI.hpp" -#include "ingen/URIs.hpp" +#include <ingen/Atom.hpp> +#include <ingen/URI.hpp> +#include <ingen/URIs.hpp> #include <initializer_list> #include <map> @@ -28,7 +28,8 @@ namespace ingen { /** A property value (an Atom with a context). */ -class Property : public Atom { +class Property : public Atom +{ public: enum class Graph { DEFAULT, ///< Default context for "universal" properties @@ -53,12 +54,18 @@ private: Graph _ctx; }; -class Properties : public std::multimap<URI, Property> { +class Properties : public std::multimap<URI, Property> +{ public: using Graph = Property::Graph; Properties() = default; - Properties(const Properties& copy) = default; + + Properties(const Properties&) = default; + Properties& operator=(const Properties&) = default; + + Properties(Properties&&) = default; + Properties& operator=(Properties&&) = default; Properties(std::initializer_list<value_type> l) : std::multimap<URI, Property>(l) @@ -77,7 +84,7 @@ public: } bool contains(const URI& key, const Atom& value) { - for (const_iterator i = find(key); i != end() && i->first == key; ++i) { + for (auto i = find(key); i != end() && i->first == key; ++i) { if (i->second == value) { return true; } |