X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/3bfb2639acaee9896a0479cfc7a44ca6f31386f7..564cf1f00c137f0bd25131710548b0480321a65b:/src/libs/PublicDataRequest.h diff --git a/src/libs/PublicDataRequest.h b/src/libs/PublicDataRequest.h index 5ff7efdb..aabb449d 100644 --- a/src/libs/PublicDataRequest.h +++ b/src/libs/PublicDataRequest.h @@ -14,7 +14,7 @@ class PublicDataRequest { PublicDataRequest(uint16_t addrcs1, uint16_t addrcs2){ target[0]= addrcs1; target[1]= addrcs2; target[2]= 0; data_taken= false; data= NULL; returned_data= true; } PublicDataRequest(uint16_t addrcs1, uint16_t addrcs2, uint16_t addrcs3){ target[0]= addrcs1; target[1]= addrcs2; target[2]= addrcs3; data_taken= false; data= NULL; returned_data= true; } - virtual ~PublicDataRequest() { data= NULL; } + virtual ~PublicDataRequest() { data= nullptr; } bool starts_with(uint16_t addr) const { return addr == this->target[0]; } bool second_element_is(uint16_t addr) const { return addr == this->target[1]; } @@ -22,9 +22,8 @@ class PublicDataRequest { bool is_taken() const { return this->data_taken; } void set_taken() { this->data_taken= true; } - void clear_returned_data() {this->returned_data= false; } bool has_returned_data() const { return this->returned_data; } - void set_data_ptr(void *d) { this->data= d; } + void set_data_ptr(void *d, bool flag= true) { this->data= d; returned_data= flag; } void* get_data_ptr(void) const { return this->data; } private: