merge(3p/absl): subtree merge of Abseil up to e19260f
... notably, this includes Abseil's own StatusOr type, which conflicted with our implementation (that was taken from TensorFlow). Change-Id: Ie7d6764b64055caaeb8dc7b6b9d066291e6b538f
This commit is contained in:
parent
cc27324d02
commit
082c006c04
854 changed files with 11260 additions and 5296 deletions
4
third_party/abseil_cpp/absl/memory/memory.h
vendored
4
third_party/abseil_cpp/absl/memory/memory.h
vendored
|
|
@ -420,6 +420,9 @@ struct pointer_traits<T*> {
|
|||
//
|
||||
// A C++11 compatible implementation of C++17's std::allocator_traits.
|
||||
//
|
||||
#if __cplusplus >= 201703L
|
||||
using std::allocator_traits;
|
||||
#else // __cplusplus >= 201703L
|
||||
template <typename Alloc>
|
||||
struct allocator_traits {
|
||||
using allocator_type = Alloc;
|
||||
|
|
@ -609,6 +612,7 @@ struct allocator_traits {
|
|||
return a;
|
||||
}
|
||||
};
|
||||
#endif // __cplusplus >= 201703L
|
||||
|
||||
namespace memory_internal {
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue