summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llsd.h14
-rw-r--r--indra/llcommon/llstring.h1
2 files changed, 1 insertions, 14 deletions
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index 7fa193e035..e018b400cb 100644
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -335,20 +335,6 @@ public:
{
return c ? (*this)[std::string_view(c)] : *this;
}
-
- template<typename T>
- LLSD(const std::map<String, T>& map, bool exclude_empty = false)
- {
- assign(emptyMap());
- for (const std::pair<String, T>& pair : map)
- {
- LLSD value(pair.second);
- if (!exclude_empty || !value.isEmpty())
- {
- insert(pair.first, value);
- }
- }
- }
//@}
/** @name Array Values */
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 7d0806b22e..b15a85cb2a 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -36,6 +36,7 @@
//#include <locale>
#include <iomanip>
#include <algorithm>
+#include <functional>
#include <vector>
#include <map>
#include <type_traits>