robopeak#43

PINTO0309 · web-flow · commit c40a0131a0d8 · 2018-05-03T01:48:44.000+09:00
diff --git a/sdk/src/arch/linux/net_serial.cpp b/sdk/src/arch/linux/net_serial.cpp
@@ -226,7 +226,7 @@ int raw_serial::waitfordata(size_t data_count, _u32 timeout, size_t * returned_s
 
     while ( isOpened() )
     {
-        time_t now = time(nullptr) * 1000;
+        time_t now = time((void*)NULL) * 1000;
         if ((now - startTime) > timeout) {
             return ANS_TIMEOUT;
         }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ int raw_serial::waitfordata(size_t data_count, _u32 timeout, size_t * returned_s`
`226`	`226`
`227`	`227`	`while ( isOpened() )`
`228`	`228`	`{`
`229`		`- time_t now = time(nullptr) * 1000;`
	`229`	`+ time_t now = time((void)NULL) 1000;`
`230`	`230`	`if ((now - startTime) > timeout) {`
`231`	`231`	`return ANS_TIMEOUT;`
`232`	`232`	`}`