feedc0de/fmt
1
0 Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

FMT_NULLPTR -> FMT_NULL and improve formatting

Browse Source 
(cherry picked from commit 1daddec151)

# Conflicts:
#	fmt/printf.h
#	fmt/string.h
#	fmt/time.h
This commit is contained in:
Victor Zverovich authored and Jonathan Müller committed 2017-06-08 11:22:50 +02:00
1 parent d3a9d03138
commit 48ba0f2aa2
5 files changed
+37 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/mock-allocator.h
+6 -4
View File
@@ -36,8 +36,8 @@ class MockAllocator {
MockAllocator() {}
MockAllocator(const MockAllocator &) {}
typedef T value_type;
MOCK_METHOD2_T(allocate, T* (std::size_t n, const T* h));
MOCK_METHOD2_T(deallocate, void (T* p, std::size_t n));
MOCK_METHOD2_T(allocate, T *(std::size_t n, const T *h));
MOCK_METHOD2_T(deallocate, void (T *p, std::size_t n));
};
template <typename Allocator>
@@ -78,8 +78,10 @@ class AllocatorRef {
Allocator *get() const { return alloc_; }
value_type* allocate(std::size_t n, const value_type* h) { return alloc_->allocate(n, h); }
void deallocate(value_type* p, std::size_t n) { alloc_->deallocate(p, n); }
value_type *allocate(std::size_t n, const value_type *h) {
return alloc_->allocate(n, h);
}
void deallocate(value_type *p, std::size_t n) { alloc_->deallocate(p, n); }
};
#endif // FMT_MOCK_ALLOCATOR_H_