aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:44:34 +0000
committerlloyd <[email protected]>2012-05-18 20:44:34 +0000
commit8383b0b503c812e45f2780217b048a19a8946853 (patch)
tree939403bad80ee2b1e13b69c82adc316422a9c7d6 /src/alloc
parentc691561f3198f481c13457433efbccc1c9fcd898 (diff)
Replace 0 and NULL pointer constants with nullptr. Also fix an old
style cast in secmem.h
Diffstat (limited to 'src/alloc')
-rw-r--r--src/alloc/secmem.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/alloc/secmem.h b/src/alloc/secmem.h
index 7c27c8d3b..5ee374b6d 100644
--- a/src/alloc/secmem.h
+++ b/src/alloc/secmem.h
@@ -61,9 +61,10 @@ class secure_allocator
}
template<typename U, typename... Args>
- void
- construct(U* p, Args&&... args)
- { ::new((void *)p) U(std::forward<Args>(args)...); }
+ void construct(U* p, Args&&... args)
+ {
+ ::new(static_cast<void*>(p)) U(std::forward<Args>(args)...);
+ }
template<typename U> void destroy(U* p) { p->~U(); }