projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove InlineExecutor.cpp
[folly.git]
/
folly
/
dynamic.h
diff --git
a/folly/dynamic.h
b/folly/dynamic.h
index 1c9ac0e0fea563eb7c526a7898f1479434a75e1e..a62805090dd9058938830571b6112c77bf273624 100644
(file)
--- a/
folly/dynamic.h
+++ b/
folly/dynamic.h
@@
-552,9
+552,7
@@
private:
explicit Data() : nul(nullptr) {}
~Data() {}
explicit Data() : nul(nullptr) {}
~Data() {}
- // XXX: gcc does an ICE if we use std::nullptr_t instead of void*
- // here. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50361
- void* nul;
+ std::nullptr_t nul;
Array array;
bool boolean;
double doubl;
Array array;
bool boolean;
double doubl;