- 2db207ef16d548380e4f5cd1d583546d0b5f7d61 Run clang-format on all outbound Copybara-transformed code. by Daniel Katz <katzdm@google.com>

- f9f24ecdf159c232b68a72b3be4d66854489f13e Run clang-format on all outbound Copybara-transformed code. by Daniel Katz <katzdm@google.com>
  - 54b1d34753a2b6999bb65e0c05255bde7de8cfb5 Properly indent the PROPERTY FOLDER calls in AbseilHelper... by Jon Cohen <cohenjon@google.com>
  - 540ce6bab1a7c81a15d7244b9effcb1c1378911b Fix -Wgnu-zero-variadic-macro-arguments warning under cla... by Derek Mauro <dmauro@google.com>
  - cc82ee3f18e882bfcba911ebc1b8ea39983f319b Suppress MSVC unreachable code warning in optional.h by Abseil Team <absl-team@google.com>
  - c1176bed2a7a2d20e72db2601f1044c097d8078c Change signature of __mmap2() in direct_mmap.h to match _... by Greg Falcon <gfalcon@google.com>
  - 5c02fe2031997fe064bd189fecc593395f34fae8 Change released benchmarks back to cc_test targets. by Alex Strelnikov <strel@google.com>
  - 7a342ecf7a8c56276d28d94158291fe2d64b2543 Fix sanitizer example command. by Derek Mauro <dmauro@google.com>
  - 0c2c55fe01cd84ab885d9f4865d7672c423680d2 Remove redundant cast; string_view::find already returns ... by Jorg Brown <jorg@google.com>

GitOrigin-RevId: 2db207ef16d548380e4f5cd1d583546d0b5f7d61
Change-Id: I5b61d91c8c7b4754c839868fc73d612b31bf5c33
This commit is contained in:
Abseil Team 2018-05-17 09:05:57 -07:00 committed by jueminyang
parent 04dd99d8c1
commit 30de20488b
12 changed files with 42 additions and 22 deletions

View file

@ -54,8 +54,8 @@ function(absl_library)
PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_LIB_PUBLIC_INCLUDE_DIRS} PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_LIB_PUBLIC_INCLUDE_DIRS}
PRIVATE ${ABSL_LIB_PRIVATE_INCLUDE_DIRS} PRIVATE ${ABSL_LIB_PRIVATE_INCLUDE_DIRS}
) )
# Add all Abseil targets to a a folder in the IDE for organization. # Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER})
if(ABSL_LIB_EXPORT_NAME) if(ABSL_LIB_EXPORT_NAME)
add_library(absl::${ABSL_LIB_EXPORT_NAME} ALIAS ${_NAME}) add_library(absl::${ABSL_LIB_EXPORT_NAME} ALIAS ${_NAME})
@ -99,8 +99,9 @@ function(absl_header_library)
PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_HO_LIB_PUBLIC_INCLUDE_DIRS} PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_HO_LIB_PUBLIC_INCLUDE_DIRS}
PRIVATE ${ABSL_HO_LIB_PRIVATE_INCLUDE_DIRS} PRIVATE ${ABSL_HO_LIB_PRIVATE_INCLUDE_DIRS}
) )
# Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER}) # Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME} PROPERTY FOLDER ${ABSL_IDE_FOLDER})
if(ABSL_HO_LIB_EXPORT_NAME) if(ABSL_HO_LIB_EXPORT_NAME)
add_library(absl::${ABSL_HO_LIB_EXPORT_NAME} ALIAS ${_NAME}) add_library(absl::${ABSL_HO_LIB_EXPORT_NAME} ALIAS ${_NAME})
@ -147,8 +148,9 @@ function(absl_test)
PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_TEST_PUBLIC_INCLUDE_DIRS} PUBLIC ${ABSL_COMMON_INCLUDE_DIRS} ${ABSL_TEST_PUBLIC_INCLUDE_DIRS}
PRIVATE ${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS} PRIVATE ${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
) )
# Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME}_bin PROPERTY FOLDER ${ABSL_IDE_FOLDER}) # Add all Abseil targets to a a folder in the IDE for organization.
set_property(TARGET ${_NAME}_bin PROPERTY FOLDER ${ABSL_IDE_FOLDER})
add_test(${_NAME} ${_NAME}_bin) add_test(${_NAME} ${_NAME}_bin)
endif(BUILD_TESTING) endif(BUILD_TESTING)

View file

@ -41,11 +41,11 @@ cc_test(
], ],
) )
cc_binary( cc_test(
name = "algorithm_benchmark", name = "algorithm_benchmark",
testonly = 1,
srcs = ["equal_benchmark.cc"], srcs = ["equal_benchmark.cc"],
copts = ABSL_TEST_COPTS, copts = ABSL_TEST_COPTS,
tags = ["benchmark"],
deps = [ deps = [
":algorithm", ":algorithm",
"//absl/base:core_headers", "//absl/base:core_headers",

View file

@ -15,8 +15,8 @@
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include "absl/algorithm/algorithm.h"
#include "benchmark/benchmark.h" #include "benchmark/benchmark.h"
#include "absl/algorithm/algorithm.h"
namespace { namespace {

View file

@ -406,11 +406,11 @@ cc_test(
], ],
) )
cc_binary( cc_test(
name = "thread_identity_benchmark", name = "thread_identity_benchmark",
testonly = 1,
srcs = ["internal/thread_identity_benchmark.cc"], srcs = ["internal/thread_identity_benchmark.cc"],
copts = ABSL_TEST_COPTS, copts = ABSL_TEST_COPTS,
tags = ["benchmark"],
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
deps = [ deps = [
":base", ":base",

View file

@ -52,7 +52,8 @@
// Example: // Example:
// //
// // Enable branches in the Abseil code that are tagged for ASan: // // Enable branches in the Abseil code that are tagged for ASan:
// $ bazel -D ADDRESS_SANITIZER -fsanitize=address *target* // $ bazel build --copt=-DADDRESS_SANITIZER --copt=-fsanitize=address
// --linkopt=-fsanitize=address *target*
// //
// Since these macro names are only supported by GCC and Clang, we only check // Since these macro names are only supported by GCC and Clang, we only check
// for `__GNUC__` (GCC or Clang) and the above macros. // for `__GNUC__` (GCC or Clang) and the above macros.

View file

@ -52,7 +52,7 @@
// SYS_mmap and SYS_munmap are not defined in Android. // SYS_mmap and SYS_munmap are not defined in Android.
#ifdef __BIONIC__ #ifdef __BIONIC__
extern "C" void* __mmap2(void*, size_t, int, int, int, long); extern "C" void* __mmap2(void*, size_t, int, int, int, size_t);
#if defined(__NR_mmap) && !defined(SYS_mmap) #if defined(__NR_mmap) && !defined(SYS_mmap)
#define SYS_mmap __NR_mmap #define SYS_mmap __NR_mmap
#endif #endif

View file

@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "benchmark/benchmark.h"
#include "absl/base/internal/thread_identity.h" #include "absl/base/internal/thread_identity.h"
#include "absl/synchronization/internal/create_thread_identity.h" #include "absl/synchronization/internal/create_thread_identity.h"
#include "absl/synchronization/internal/per_thread_sem.h" #include "absl/synchronization/internal/per_thread_sem.h"
#include "benchmark/benchmark.h"
namespace { namespace {

View file

@ -62,11 +62,11 @@ cc_test(
], ],
) )
cc_binary( cc_test(
name = "fixed_array_benchmark", name = "fixed_array_benchmark",
testonly = 1,
srcs = ["fixed_array_benchmark.cc"], srcs = ["fixed_array_benchmark.cc"],
copts = ABSL_TEST_COPTS + ["$(STACK_FRAME_UNLIMITED)"], copts = ABSL_TEST_COPTS + ["$(STACK_FRAME_UNLIMITED)"],
tags = ["benchmark"],
deps = [ deps = [
":fixed_array", ":fixed_array",
"@com_github_google_benchmark//:benchmark", "@com_github_google_benchmark//:benchmark",
@ -117,11 +117,11 @@ cc_test(
], ],
) )
cc_binary( cc_test(
name = "inlined_vector_benchmark", name = "inlined_vector_benchmark",
testonly = 1,
srcs = ["inlined_vector_benchmark.cc"], srcs = ["inlined_vector_benchmark.cc"],
copts = ABSL_TEST_COPTS, copts = ABSL_TEST_COPTS,
tags = ["benchmark"],
deps = [ deps = [
":inlined_vector", ":inlined_vector",
"//absl/base", "//absl/base",

View file

@ -17,9 +17,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "benchmark/benchmark.h"
#include "absl/base/internal/raw_logging.h" #include "absl/base/internal/raw_logging.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#include "benchmark/benchmark.h"
namespace { namespace {

View file

@ -132,8 +132,17 @@ constexpr int kFailureSignals[] = {
#endif #endif
}; };
std::string SignalParamToString(const ::testing::TestParamInfo<int>& info) {
std::string result = absl::debugging_internal::FailureSignalToString(info.param);
if (result.empty()) {
result = absl::StrCat(info.param);
}
return result;
}
INSTANTIATE_TEST_CASE_P(AbslDeathTest, FailureSignalHandlerDeathTest, INSTANTIATE_TEST_CASE_P(AbslDeathTest, FailureSignalHandlerDeathTest,
::testing::ValuesIn(kFailureSignals)); ::testing::ValuesIn(kFailureSignals),
SignalParamToString);
#endif // GTEST_HAS_DEATH_TEST #endif // GTEST_HAS_DEATH_TEST

View file

@ -43,8 +43,7 @@ namespace absl {
// //
// Returns whether a given std::string `haystack` contains the substring `needle`. // Returns whether a given std::string `haystack` contains the substring `needle`.
inline bool StrContains(absl::string_view haystack, absl::string_view needle) { inline bool StrContains(absl::string_view haystack, absl::string_view needle) {
return static_cast<absl::string_view::size_type>(haystack.find(needle, 0)) != return haystack.find(needle, 0) != haystack.npos;
haystack.npos;
} }
// StartsWith() // StartsWith()

View file

@ -820,6 +820,12 @@ class optional : private optional_internal::optional_data<T>,
// only if `*this` is empty. // only if `*this` is empty.
constexpr bool has_value() const noexcept { return this->engaged_; } constexpr bool has_value() const noexcept { return this->engaged_; }
// Suppress bogus warning on MSVC: MSVC complains call to reference() after
// throw_bad_optional_access() is unreachable.
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4702)
#endif // _MSC_VER
// optional::value() // optional::value()
// //
// Returns a reference to an `optional`s underlying value. The constness // Returns a reference to an `optional`s underlying value. The constness
@ -848,6 +854,9 @@ class optional : private optional_internal::optional_data<T>,
? reference() ? reference()
: (optional_internal::throw_bad_optional_access(), reference())); : (optional_internal::throw_bad_optional_access(), reference()));
} }
#ifdef _MSC_VER
#pragma warning(pop)
#endif // _MSC_VER
// optional::value_or() // optional::value_or()
// //