revert my hack that disabled StopWatchNano ... and caused build warnings (#23)

matthewvon · web-flow · commit 3e338d74139f · 2021-01-28T09:02:10.000-05:00
diff --git a/util/stop_watch.h b/util/stop_watch.h
@@ -91,10 +91,10 @@ class StopWatchNano {
     }
   }
 
-  void Start() { start_ = 0; /*env_->NowNanos();*/ }
+  void Start() { start_ = env_->NowNanos(); }
 
   uint64_t ElapsedNanos(bool reset = false) {
-    auto now = 0; // env_->NowNanos();
+    auto now = env_->NowNanos();
     auto elapsed = now - start_;
     if (reset) {
       start_ = now;
@@ -103,7 +103,7 @@ class StopWatchNano {
   }
 
   uint64_t ElapsedNanosSafe(bool reset = false) {
-    return 0; //(env_ != nullptr) ? ElapsedNanos(reset) : 0U;
+    return (env_ != nullptr) ? ElapsedNanos(reset) : 0U;
   }
 
  private:

Original file line number	Diff line number	Diff line change
`@@ -91,10 +91,10 @@ class StopWatchNano {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- void Start() { start_ = 0; /env_->NowNanos();/ }`
	`94`	`+ void Start() { start_ = env_->NowNanos(); }`
`95`	`95`
`96`	`96`	`uint64_t ElapsedNanos(bool reset = false) {`
`97`		`- auto now = 0; // env_->NowNanos();`
	`97`	`+ auto now = env_->NowNanos();`
`98`	`98`	`auto elapsed = now - start_;`
`99`	`99`	`if (reset) {`
`100`	`100`	`start_ = now;`
`@@ -103,7 +103,7 @@ class StopWatchNano {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`uint64_t ElapsedNanosSafe(bool reset = false) {`
`106`		`- return 0; //(env_ != nullptr) ? ElapsedNanos(reset) : 0U;`
	`106`	`+ return (env_ != nullptr) ? ElapsedNanos(reset) : 0U;`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`private:`