Skip to content

Commit dec3447

Browse files
committed
8264346: nullptr_t undefined in global namespace for clang+libstdc++
Reviewed-by: dholmes, kbarrett
1 parent 0fa3572 commit dec3447

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/hotspot/share/oops/oopsHierarchy.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ class oop {
100100
bool operator==(const oop& o) const { return _o == o._o; }
101101
bool operator!=(const oop& o) const { return _o != o._o; }
102102

103-
bool operator==(nullptr_t) const { return _o == nullptr; }
104-
bool operator!=(nullptr_t) const { return _o != nullptr; }
103+
bool operator==(std::nullptr_t) const { return _o == nullptr; }
104+
bool operator!=(std::nullptr_t) const { return _o != nullptr; }
105105

106106
oop& operator=(const oop& o) { _o = o._o; return *this; }
107107
};

src/hotspot/share/utilities/globalDefinitions.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
#include COMPILER_HEADER(utilities/globalDefinitions)
3636

37+
#include <cstddef>
38+
3739
class oopDesc;
3840

3941
// Defaults for macros that might be defined per compiler.

0 commit comments

Comments
 (0)