From 24501dfa0ee3fd6f5755deb1bc5261cd297a2bc7 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 12 May 2021 22:35:09 -0400
Subject: [PATCH] SL-10297: Use initializer_list<std::string> vs.
<std::string_view>.
This is somewhat more expensive for string literals, but switching to
std::string_view implies more extensive changes, to be considered separately.
---
indra/llcommon/llsingleton.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 163c08099f8..7c81d65a8bb 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -29,7 +29,6 @@
#include <boost/unordered_set.hpp>
#include <initializer_list>
#include <list>
-#include <string_view>
#include <typeinfo>
#include <vector>
#include "mutex.h"
@@ -114,7 +113,7 @@ class LLSingletonBase: private boost::noncopyable
// delegate logging calls to llsingleton.cpp
public:
- typedef std::initializer_list<std::string_view> string_params;
+ typedef std::initializer_list<const std::string> string_params;
protected:
static void logerrs (const string_params&);
static void logwarns (const string_params&);
--
GitLab