diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-01-30 11:25:42 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-01-30 11:25:42 +0200 |
| commit | 67d799852492743a93a464002395ccb624514fb8 (patch) | |
| tree | d46193a6c13f9cd64f9ff545b8b1f5fc441bab00 /libbuild2/config | |
| parent | f6319b258bb478e19d4a17852a8406e6b1119b87 (diff) | |
Add std::{map, multimap} to types.hxx
Seeing that std::map is becoming a common Buildfile variable type.
Diffstat (limited to 'libbuild2/config')
| -rw-r--r-- | libbuild2/config/module.hxx | 4 | ||||
| -rw-r--r-- | libbuild2/config/operation.cxx | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/libbuild2/config/module.hxx b/libbuild2/config/module.hxx index 857a30c..3afe721 100644 --- a/libbuild2/config/module.hxx +++ b/libbuild2/config/module.hxx @@ -4,8 +4,6 @@ #ifndef LIBBUILD2_CONFIG_MODULE_HXX #define LIBBUILD2_CONFIG_MODULE_HXX -#include <map> - #include <libbutl/prefix-map.mxx> #include <libbuild2/types.hxx> @@ -55,7 +53,7 @@ namespace build2 // Priority order with INT32_MIN being the highest. Modules with the // same priority are saved in the order inserted. // - std::multimap<std::int32_t, const_iterator> order; + multimap<std::int32_t, const_iterator> order; pair<iterator, bool> insert (string name, int prio = 0) diff --git a/libbuild2/config/operation.cxx b/libbuild2/config/operation.cxx index b9856be..f9d83da 100644 --- a/libbuild2/config/operation.cxx +++ b/libbuild2/config/operation.cxx @@ -82,8 +82,6 @@ namespace build2 } } - using project_set = set<const scope*>; // Use pointers to get comparison. - // Return (first) whether an unused/inherited variable should be saved // according to the config.config.persist value and (second) whether the // user should be warned about it. |