diff options
| author |  Sadie Powell | 2021-03-02 02:44:41 +0000 |
|---|---|---|
| committer | Sadie Powell | 2021-03-02 02:56:49 +0000 |
| commit | 3f113fc04628491cb795d2fc809d89ff2379c61a (patch) | |
| tree | 96f157ee67231916a41bdc4f73b92b96f229a05e /include | |
| parent | Replace manual copy prevention with the insp::uncopiable class. (diff) | |
Move iterator_range to the utility directory and renamespace.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 2 | ||||
| -rw-r--r-- | include/inspircd.h | 3 | ||||
| -rw-r--r-- | include/utility/iterator_range.h (renamed from include/iterator_range.h) | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/configreader.h b/include/configreader.h index 88a444840..a472144f6 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -300,7 +300,7 @@ class CoreExport ServerConfig typedef std::multimap<std::string, std::shared_ptr<ConfigTag>, irc::insensitive_swo> TagMap; /** Holds iterators to a subsection of the server config map. */ - typedef stdalgo::iterator_range<TagMap::const_iterator> TagList; + typedef insp::iterator_range<TagMap::const_iterator> TagList; /** Get a configuration tag by name. If one or more tags are present then the first is returned. * @param tag The name of the tag to get. diff --git a/include/inspircd.h b/include/inspircd.h index d3ddee776..ffff42be0 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -57,11 +57,12 @@ #include <unordered_map> #include <vector> +#include "utility/iterator_range.h" + #include "intrusive_list.h" #include "flat_map.h" #include "compat.h" #include "aligned_storage.h" -#include "iterator_range.h" #include "typedefs.h" #include "convto.h" #include "stdalgo.h" diff --git a/include/iterator_range.h b/include/utility/iterator_range.h index e760646d5..ff8d8d10e 100644 --- a/include/iterator_range.h +++ b/include/utility/iterator_range.h @@ -19,7 +19,7 @@ #pragma once -namespace stdalgo +namespace insp { template <typename Iterator> class iterator_range; @@ -37,7 +37,7 @@ namespace stdalgo /** Represents a range of iterators. */ template <typename Iterator> -class stdalgo::iterator_range +class insp::iterator_range final { private: /** An iterator which points to the start of the range. */ |