Commit21eb965

committed

Fixarduino#217 issue with compiling with newer compiler

1 parentc486627 commit21eb965Copy full SHA for 21eb965

File tree

-10

lines changed

-10

lines changed

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,7 @@ class CanMsg : public Printable`
`51`	`51`
`52`	`52`	`CanMsg() : CanMsg(0,0,nullptr) { }`
`53`	`53`
`54`		`-CanMsg(CanMsgconst & other)`
`55`		`- {`
`56`		`-this->id = other.id;`
`57`		`-this->data_length = other.data_length;`
`58`		`-if (this->data_length && other.data)`
`59`		`-memcpy(this->data, other.data,this->data_length);`
	`54`	`+CanMsg(CanMsgconst & other) : CanMsg(other.id, other.data_length, other.data) {`
`60`	`55`	`}`
`61`	`56`
`62`	`57`	`virtual~CanMsg() { }`
`@@ -65,10 +60,10 @@ class CanMsg : public Printable`
`65`	`60`	`{`
`66`	`61`	`if (this != &other)`
`67`	`62`	`{`
`68`		`-this->id = other.id;`
`69`		`-this->data_length = other.data_length;`
`70`		`-if (this->data_length&& other.data)`
`71`		`-memcpy(this->data, other.data,this->data_length);`
	`63`	`+ id = other.id;`
	`64`	`+ data_length = other.data_length;`
	`65`	`+if (data_length>0)`
	`66`	`+memcpy(data, other.data, data_length);`
`72`	`67`	`}`
`73`	`68`	`return (*this);`
`74`	`69`	`}`

Comments

(0)