| Index: gpu/command_buffer/client/fenced_allocator.cc
|
| diff --git a/gpu/command_buffer/client/fenced_allocator.cc b/gpu/command_buffer/client/fenced_allocator.cc
|
| index 726fe7dafd3a311ba9e45bcad554ca43ed676aa2..e0db1e9713f51b82a9cf2ac9b9e6fa6a68920995 100644
|
| --- a/gpu/command_buffer/client/fenced_allocator.cc
|
| +++ b/gpu/command_buffer/client/fenced_allocator.cc
|
| @@ -27,7 +27,8 @@ unsigned int RoundUp(unsigned int size) {
|
|
|
| } // namespace
|
|
|
| -#ifndef _MSC_VER
|
| +// VS 2015 and above allow these definitions and in this case require them
|
| +#if !defined(_MSC_VER) || _MSC_VER >= 1900
|
| const FencedAllocator::Offset FencedAllocator::kInvalidOffset;
|
| const unsigned int FencedAllocator::kAllocAlignment;
|
| #endif
|
|
|