| commit | 5d5b6627479ee560ff50e4f0284e78c8d0111258 | [log] [tgz] |
|---|---|---|
| author | Jim Stichnoth <stichnot@chromium.org> | Fri Sep 09 09:29:08 2016 -0700 |
| committer | Jim Stichnoth <stichnot@chromium.org> | Fri Sep 09 09:29:08 2016 -0700 |
| tree | ff5faa2010e36a0ed2d3de227f4f0bd391db802a | |
| parent | a9a92a5edb64fac48bc300bc257f1e75612b4cb6 [diff] [blame] |
Subzero: Fix a build error. Also reformat. BUG= none TBR=nicolascapens@chromium.org Review URL: https://codereview.chromium.org/2328873003 .
diff --git a/src/IceMemory.cpp b/src/IceMemory.cpp index 0026661..ce1ff6a 100644 --- a/src/IceMemory.cpp +++ b/src/IceMemory.cpp
@@ -38,7 +38,7 @@ ICE_TLS_SET_FIELD(CfgAllocator, Allocator); } -void CfgAllocatorTraits::set_current(nullptr_t) { +void CfgAllocatorTraits::set_current(std::nullptr_t) { ICE_TLS_SET_FIELD(CfgAllocator, nullptr); }