From 67d799852492743a93a464002395ccb624514fb8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 30 Jan 2021 11:25:42 +0200
Subject: Add std::{map, multimap} to types.hxx

Seeing that std::map is becoming a common Buildfile variable type.
---
 libbuild2/cc/guess.cxx     | 1 -
 libbuild2/cc/link-rule.cxx | 2 --
 libbuild2/cc/module.cxx    | 1 -
 libbuild2/cc/types.hxx     | 3 +--
 4 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx
index d068c20..1e0c77a 100644
--- a/libbuild2/cc/guess.cxx
+++ b/libbuild2/cc/guess.cxx
@@ -65,7 +65,6 @@
 #  include <libbuild2/filesystem.hxx>
 #endif
 
-#include <map>
 #include <cstring> // strlen(), strchr(), strstr()
 
 #include <libbuild2/diagnostics.hxx>
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 9b75e8d..5b12876 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -3,7 +3,6 @@
 
 #include <libbuild2/cc/link-rule.hxx>
 
-#include <map>
 #include <cstdlib>  // exit()
 #include <cstring>  // strlen()
 
@@ -24,7 +23,6 @@
 #include <libbuild2/cc/target.hxx>  // c, pc*
 #include <libbuild2/cc/utility.hxx>
 
-using std::map;
 using std::exit;
 
 using namespace butl;
diff --git a/libbuild2/cc/module.cxx b/libbuild2/cc/module.cxx
index 1709c23..971f175 100644
--- a/libbuild2/cc/module.cxx
+++ b/libbuild2/cc/module.cxx
@@ -3,7 +3,6 @@
 
 #include <libbuild2/cc/module.hxx>
 
-#include <map>
 #include <iomanip> // left, setw()
 
 #include <libbuild2/scope.hxx>
diff --git a/libbuild2/cc/types.hxx b/libbuild2/cc/types.hxx
index 70a6340..1297b7b 100644
--- a/libbuild2/cc/types.hxx
+++ b/libbuild2/cc/types.hxx
@@ -4,7 +4,6 @@
 #ifndef LIBBUILD2_CC_TYPES_HXX
 #define LIBBUILD2_CC_TYPES_HXX
 
-#include <map>
 #include <unordered_map>
 
 #include <libbuild2/types.hxx>
@@ -149,7 +148,7 @@ namespace build2
     // The key is either an absolute and normalized header path or a reference
     // to an importable_headers group (e.g., <vector>, std).
     //
-    using translatable_headers = std::map<string, optional<bool>>;
+    using translatable_headers = map<string, optional<bool>>;
 
     // Special translatable header groups.
     //
-- 
cgit v1.1