diff options
| author | Abseil Team <absl-team@google.com> | 2017-12-20T20·34-0800 |
|---|---|---|
| committer | Xiaoyi Zhang <zhangxy988@gmail.com> | 2017-12-20T22·03-0500 |
| commit | ff7045647330f5dc21725a42456091207f3eecd5 (patch) | |
| tree | cae476d37e272b1a1d48172f07c4a7229a027fea /absl/synchronization | |
| parent | 4972c72c5cf2f27e2a0846ce9ff5d377d3f2b7af (diff) | |
Changes imported from Abseil "staging" branch:
- 20f4e7133d695e9a05e13ebdfd4d78da310b42b5 Remove the warning supressions -Wno-documentation and by Derek Mauro <dmauro@google.com> - e1bde85c0571673b1e7a88b9d45a393606ba7e6c Changed the optimized version of strings_internal::JoinAl... by Abseil Team <absl-team@google.com> - 746e6716b4c15be61547670d68d25a1c850d3954 Add missing absl:: qualification. by Alex Strelnikov <strel@google.com> - 4e5c18c488cbd49ca72b02911cf22d830d5a7f16 Internals change: Remove the ability to pass a custom met... by Greg Falcon <gfalcon@google.com> - 65d58107a5730d4b6468bbffc72bea2f980af826 Moved most common character case (ascii printable) out of... by Abseil Team <absl-team@google.com> - f031331cc55a3d57b9110e12c7cbe50ac3e2a04f Add missing copyright headers to a few source files. by Greg Falcon <gfalcon@google.com> - 6035a77af6fa951c536b42df4c710d16d1817aec Enable libstdc++'s memcmp optimization in absl::equal for... by Abseil Team <absl-team@google.com> - 73a665a4a10781e5d89f75a876ece7ad859f4116 Fix minor spelling error "hexidecimal". by Abseil Team <absl-team@google.com> GitOrigin-RevId: 20f4e7133d695e9a05e13ebdfd4d78da310b42b5 Change-Id: Id8c18ebd331d096935052a6ab259ebe0e2ef13ae
Diffstat (limited to 'absl/synchronization')
| -rw-r--r-- | absl/synchronization/internal/graphcycles.cc | 3 | ||||
| -rw-r--r-- | absl/synchronization/mutex.cc | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/absl/synchronization/internal/graphcycles.cc b/absl/synchronization/internal/graphcycles.cc index 9bc9c8a0f00d..28ad172c01a2 100644 --- a/absl/synchronization/internal/graphcycles.cc +++ b/absl/synchronization/internal/graphcycles.cc @@ -56,8 +56,7 @@ static base_internal::LowLevelAlloc::Arena* arena; static void InitArenaIfNecessary() { arena_mu.Lock(); if (arena == nullptr) { - arena = base_internal::LowLevelAlloc::NewArena( - 0, base_internal::LowLevelAlloc::DefaultArena()); + arena = base_internal::LowLevelAlloc::NewArena(0); } arena_mu.Unlock(); } diff --git a/absl/synchronization/mutex.cc b/absl/synchronization/mutex.cc index b2aa743977ac..06a058cf710b 100644 --- a/absl/synchronization/mutex.cc +++ b/absl/synchronization/mutex.cc @@ -1,3 +1,17 @@ +// Copyright 2017 The Abseil Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// 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 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + #include "absl/synchronization/mutex.h" #ifdef _WIN32 |