From b15cbddb8bf013bc2d8c478b7def435cc4cee9d7 Mon Sep 17 00:00:00 2001 From: Anay Wadhera Date: Fri, 6 Sep 2024 12:21:22 -0700 Subject: [PATCH] Use absl::NoDestructor for static flat_hash_map PiperOrigin-RevId: 671853605 --- sharing/internal/base/BUILD | 1 + sharing/internal/base/mime.cc | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sharing/internal/base/BUILD b/sharing/internal/base/BUILD index c3187d9c..63637675 100644 --- a/sharing/internal/base/BUILD +++ b/sharing/internal/base/BUILD @@ -34,6 +34,7 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ + "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", diff --git a/sharing/internal/base/mime.cc b/sharing/internal/base/mime.cc index d67f4ea0..bf83bb1a 100644 --- a/sharing/internal/base/mime.cc +++ b/sharing/internal/base/mime.cc @@ -16,6 +16,7 @@ #include +#include "absl/base/no_destructor.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/ascii.h" #include "absl/strings/string_view.h" @@ -27,10 +28,9 @@ namespace utils { // http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types. std::string GetWellKnownMimeTypeFromExtension(absl::string_view extension) { // The extension types in this map must be lower case. - static absl::flat_hash_map< + static absl::NoDestructor* mime_map = new absl::flat_hash_map({ + std::string>> mime_map({ {"123", "application/vnd.lotus-1-2-3"}, {"3dml", "text/vnd.in3d.3dml"}, {"3ds", "image/x-3ds"},