SERVER-51476 upgrade to Abseil 20210324.1

(cherry picked from commit defbe4582778e3da3abdc23c73ef7639543ab380)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/third_party/abseil-cpp-master/abseil-cpp/absl/types/bad_optional_access.cc b/src/third_party/abseil-cpp-master/abseil-cpp/absl/types/bad_optional_access.cc
index 558707760e9..26aca70d9cf 100644
--- a/src/third_party/abseil-cpp-master/abseil-cpp/absl/types/bad_optional_access.cc
+++ b/src/third_party/abseil-cpp-master/abseil-cpp/absl/types/bad_optional_access.cc
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+//      https://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,7 +14,7 @@
 
 #include "absl/types/bad_optional_access.h"
 
-#ifndef ABSL_HAVE_STD_OPTIONAL
+#ifndef ABSL_USES_STD_OPTIONAL
 
 #include <cstdlib>
 
@@ -22,6 +22,7 @@
 #include "absl/base/internal/raw_logging.h"
 
 namespace absl {
+ABSL_NAMESPACE_BEGIN
 
 bad_optional_access::~bad_optional_access() = default;
 
@@ -41,6 +42,7 @@ void throw_bad_optional_access() {
 }
 
 }  // namespace optional_internal
+ABSL_NAMESPACE_END
 }  // namespace absl
 
-#endif  // ABSL_HAVE_STD_OPTIONAL
+#endif  // ABSL_USES_STD_OPTIONAL