Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: src/IceMemory.cpp

Issue 2328873003: Subzero: Fix a build error. Also reformat. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/IceMemory.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 //===- subzero/src/IceMemory.cpp - Memory management definitions -*- C++ -*-==// 1 //===- subzero/src/IceMemory.cpp - Memory management definitions -*- C++ -*-==//
2 // 2 //
3 // The Subzero Code Generator 3 // The Subzero Code Generator
4 // 4 //
5 // This file is distributed under the University of Illinois Open Source 5 // This file is distributed under the University of Illinois Open Source
6 // License. See LICENSE.TXT for details. 6 // License. See LICENSE.TXT for details.
7 // 7 //
8 //===----------------------------------------------------------------------===// 8 //===----------------------------------------------------------------------===//
9 /// 9 ///
10 /// \file 10 /// \file
(...skipping 20 matching lines...) Expand all
31 void CfgAllocatorTraits::set_current(const manager_type *Manager) { 31 void CfgAllocatorTraits::set_current(const manager_type *Manager) {
32 ArenaAllocator *Allocator = 32 ArenaAllocator *Allocator =
33 Manager == nullptr ? nullptr : Manager->Allocator.get(); 33 Manager == nullptr ? nullptr : Manager->Allocator.get();
34 set_current(Allocator); 34 set_current(Allocator);
35 } 35 }
36 36
37 void CfgAllocatorTraits::set_current(ArenaAllocator *Allocator) { 37 void CfgAllocatorTraits::set_current(ArenaAllocator *Allocator) {
38 ICE_TLS_SET_FIELD(CfgAllocator, Allocator); 38 ICE_TLS_SET_FIELD(CfgAllocator, Allocator);
39 } 39 }
40 40
41 void CfgAllocatorTraits::set_current(nullptr_t) { 41 void CfgAllocatorTraits::set_current(std::nullptr_t) {
42 ICE_TLS_SET_FIELD(CfgAllocator, nullptr); 42 ICE_TLS_SET_FIELD(CfgAllocator, nullptr);
43 } 43 }
44 44
45 ICE_TLS_DEFINE_FIELD(ArenaAllocator *, LivenessAllocatorTraits, 45 ICE_TLS_DEFINE_FIELD(ArenaAllocator *, LivenessAllocatorTraits,
46 LivenessAllocator); 46 LivenessAllocator);
47 47
48 LivenessAllocatorTraits::allocator_type LivenessAllocatorTraits::current() { 48 LivenessAllocatorTraits::allocator_type LivenessAllocatorTraits::current() {
49 return ICE_TLS_GET_FIELD(LivenessAllocator); 49 return ICE_TLS_GET_FIELD(LivenessAllocator);
50 } 50 }
51 51
52 void LivenessAllocatorTraits::set_current(const manager_type *Manager) { 52 void LivenessAllocatorTraits::set_current(const manager_type *Manager) {
53 ArenaAllocator *Allocator = 53 ArenaAllocator *Allocator =
54 Manager == nullptr ? nullptr : Manager->getAllocator(); 54 Manager == nullptr ? nullptr : Manager->getAllocator();
55 ICE_TLS_SET_FIELD(LivenessAllocator, Allocator); 55 ICE_TLS_SET_FIELD(LivenessAllocator, Allocator);
56 } 56 }
57 } // end of namespace Ice 57 } // end of namespace Ice
OLDNEW
« no previous file with comments | « src/IceMemory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698