summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2017-11-30 16:31:35 -0800
committerElliott Hughes <enh@google.com>2017-11-30 16:32:15 -0800
commite805883a2b088a187ce4339e04387efbeb35b512 (patch)
tree0a31d7e95a62086d1d60f40fe09803d5c2adb6de /liblog
parentaaa0bbce8eadf1a428493f3524066a74447eded4 (diff)
downloadsystem_core-e805883a2b088a187ce4339e04387efbeb35b512.tar.gz
system_core-e805883a2b088a187ce4339e04387efbeb35b512.tar.bz2
system_core-e805883a2b088a187ce4339e04387efbeb35b512.zip
std::string_view is no longer experimental.
Bug: N/A Test: builds Change-Id: I8f022fdc3ebaebd8aa250414569485a752f98da7
Diffstat (limited to 'liblog')
-rw-r--r--liblog/event_tag_map.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/liblog/event_tag_map.cpp b/liblog/event_tag_map.cpp
index 83064fde3..2e2bf8734 100644
--- a/liblog/event_tag_map.cpp
+++ b/liblog/event_tag_map.cpp
@@ -25,9 +25,9 @@
#include <string.h>
#include <sys/mman.h>
-#include <experimental/string_view>
#include <functional>
#include <string>
+#include <string_view>
#include <unordered_map>
#include <log/event_tag_map.h>
@@ -44,10 +44,10 @@
class MapString {
private:
const std::string* alloc; // HAS-AN
- const std::experimental::string_view str; // HAS-A
+ const std::string_view str; // HAS-A
public:
- operator const std::experimental::string_view() const {
+ operator const std::string_view() const {
return str;
}
@@ -92,8 +92,7 @@ struct std::hash<MapString>
: public std::unary_function<const MapString&, size_t> {
size_t operator()(const MapString& __t) const noexcept {
if (!__t.length()) return 0;
- return std::hash<std::experimental::string_view>()(
- std::experimental::string_view(__t));
+ return std::hash<std::string_view>()(std::string_view(__t));
}
};