projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace NULL with nullptr
[libcds.git]
/
cds
/
gc
/
hp_decl.h
diff --git
a/cds/gc/hp_decl.h
b/cds/gc/hp_decl.h
index 4b6d0edcf444dbf341a7530d8b39079364f3e28b..6c00f4c542ed7e626de6e05443b03633da0f8672 100644
(file)
--- a/
cds/gc/hp_decl.h
+++ b/
cds/gc/hp_decl.h
@@
-222,6
+222,13
@@
namespace cds { namespace gc {
return base_class::operator =(p);
}
return base_class::operator =(p);
}
+ //@cond
+ std::nullptr_t assign( std::nullptr_t )
+ {
+ return base_class::operator =(nullptr);
+ }
+ //@endcond
+
/// Copy from \p src guard to \p this guard
void copy( Guard const& src )
{
/// Copy from \p src guard to \p this guard
void copy( Guard const& src )
{
@@
-242,7
+249,7
@@
namespace cds { namespace gc {
/// Clear value of the guard
void clear()
{
/// Clear value of the guard
void clear()
{
- assign(
reinterpret_cast<void *>(NULL)
);
+ assign(
nullptr
);
}
/// Get the value currently protected
}
/// Get the value currently protected