Skip to content

Commit c0b7adb

Browse files
authored
Merge pull request #104 from DenisBiryukov91/fix/std-nullptr
add missing std:: prefix to nullptr_t
2 parents 72cedc9 + 10875f5 commit c0b7adb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/zenohcxx/api.hxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ class BytesView : public Copyable<::z_bytes_t> {
289289
/// @name Constructors
290290

291291
/// @brief Constructs an uninitialized instance
292-
BytesView(nullptr_t) : Copyable(init(nullptr, 0)) {}
292+
BytesView(std::nullptr_t) : Copyable(init(nullptr, 0)) {}
293293
/// Constructs an instance from an array of bytes
294294
/// @param s the array of bytes
295295
/// @param _len the length of the array
@@ -507,7 +507,7 @@ struct KeyExprView : public Copyable<::z_keyexpr_t> {
507507
/// @name Constructors
508508

509509
/// @brief Constructs an uninitialized instance
510-
KeyExprView(nullptr_t) : Copyable(::z_keyexpr(nullptr)) {}
510+
KeyExprView(std::nullptr_t) : Copyable(::z_keyexpr(nullptr)) {}
511511
/// @brief Constructs an instance from a null-terminated string representing a key expression.
512512
KeyExprView(const char* name) : Copyable(::z_keyexpr(name)) {}
513513
/// @brief Constructs an instance from a null-terminated string representing a key expression withot validating it
@@ -1597,7 +1597,7 @@ class KeyExpr : public Owned<::z_owned_keyexpr_t> {
15971597
/// @name Constructors
15981598

15991599
/// @brief Create an uninitialized instance
1600-
explicit KeyExpr(nullptr_t) : Owned(nullptr) {}
1600+
explicit KeyExpr(std::nullptr_t) : Owned(nullptr) {}
16011601

16021602
/// @brief Create a new instance from a null-terminated string
16031603
explicit KeyExpr(const char* name) : Owned(::z_keyexpr_new(name)) {}
@@ -1979,7 +1979,7 @@ class Session : public Owned<::z_owned_session_t> {
19791979
// generated by the compiler anymore
19801980
//
19811981
Session(Session&& other) : Owned(std::move(other)) {}
1982-
Session(nullptr_t) : Owned(nullptr) {}
1982+
Session(std::nullptr_t) : Owned(nullptr) {}
19831983
Session&& operator=(Session&& other);
19841984
void drop();
19851985
~Session() { drop(); }

0 commit comments

Comments
 (0)