Merge pull request #847 from romainfrancois/master

eddelbuettel · web-flow · commit 11387670f923 · 2018-04-25T08:14:10.000-05:00
undef FALSE in Timer
diff --git a/inst/include/Rcpp/Benchmark/Timer.h b/inst/include/Rcpp/Benchmark/Timer.h
@@ -120,17 +120,17 @@ namespace Rcpp{
             out.attr("names") = names;
             return out;
         }
-        
+
         static std::vector<Timer> get_timers(int n){
             return std::vector<Timer>( n, Timer() ) ;
         }
-        
+
         inline nanotime_t now() const {
             return get_nanotime() ;
         }
-        
+
         inline nanotime_t origin() const {
-            return start_time ;    
+            return start_time ;
         }
 
     private:
@@ -143,5 +143,8 @@ namespace Rcpp{
 
 }
 
+#ifdef FALSE
+  #undef FALSE
 #endif
 
+#endif

Original file line number	Diff line number	Diff line change
`@@ -120,17 +120,17 @@ namespace Rcpp{`
`120`	`120`	`out.attr("names") = names;`
`121`	`121`	`return out;`
`122`	`122`	`}`
`123`		`-`
	`123`	`+`
`124`	`124`	`static std::vector<Timer> get_timers(int n){`
`125`	`125`	`return std::vector<Timer>( n, Timer() ) ;`
`126`	`126`	`}`
`127`		`-`
	`127`	`+`
`128`	`128`	`inline nanotime_t now() const {`
`129`	`129`	`return get_nanotime() ;`
`130`	`130`	`}`
`131`		`-`
	`131`	`+`
`132`	`132`	`inline nanotime_t origin() const {`
`133`		`- return start_time ;`
	`133`	`+ return start_time ;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`private:`
`@@ -143,5 +143,8 @@ namespace Rcpp{`
`143`	`143`
`144`	`144`	`}`
`145`	`145`
	`146`	`+#ifdef FALSE`
	`147`	`+ #undef FALSE`
`146`	`148`	`#endif`
`147`	`149`
	`150`	`+#endif`