Fix rebase onto upstream master

Chris Hold · Chris Hold · commit fde501c3946b · 2019-07-17T13:36:50.000+03:00
diff --git a/src/trackerpolhemus.h b/src/trackerpolhemus.h
@@ -59,7 +59,7 @@ class TrackerPolhemus : public Tracker
 
     virtual void calibrate() override
     {
-        VERBOSE2("Calibrate.");
+        SSR_VERBOSE2("Calibrate.");
         Tracker::azi_correction = _current_azimuth + 90;
     }
 
diff --git a/src/trackerrazor.h b/src/trackerrazor.h
@@ -59,7 +59,7 @@ class TrackerRazor : public Tracker
 
   virtual void calibrate() override
   {
-      VERBOSE2("Calibrate.");
+      SSR_VERBOSE2("Calibrate.");
       Tracker::azi_correction = _current_azimuth + 90;
   }
 
diff --git a/src/trackervrpn.h b/src/trackervrpn.h
@@ -59,7 +59,7 @@ class TrackerVrpn : public Tracker, public vrpn_Tracker_Remote
 
     virtual void calibrate() override
     {
-        VERBOSE2("Calibrate.");
+        SSR_VERBOSE2("Calibrate.");
         Tracker::azi_correction = _current_azimuth + 90;
     }
 
@@ -75,7 +75,7 @@ class TrackerVrpn : public Tracker, public vrpn_Tracker_Remote
     /// VRPN callback function
     static void VRPN_CALLBACK handle_tracker(void *userdata, const vrpn_TRACKERCB t);
 
-    void update(const Tracker::Tracker_data &_data);
+    void update(const Tracker::Tracker_data &_data) override;
 
     // thread related stuff
     std::thread _tracker_thread;

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class TrackerPolhemus : public Tracker`
`59`	`59`
`60`	`60`	`virtual void calibrate() override`
`61`	`61`	`{`
`62`		`- VERBOSE2("Calibrate.");`
	`62`	`+ SSR_VERBOSE2("Calibrate.");`
`63`	`63`	`Tracker::azi_correction = _current_azimuth + 90;`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class TrackerRazor : public Tracker`
`59`	`59`
`60`	`60`	`virtual void calibrate() override`
`61`	`61`	`{`
`62`		`- VERBOSE2("Calibrate.");`
	`62`	`+ SSR_VERBOSE2("Calibrate.");`
`63`	`63`	`Tracker::azi_correction = _current_azimuth + 90;`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class TrackerVrpn : public Tracker, public vrpn_Tracker_Remote`
`59`	`59`
`60`	`60`	`virtual void calibrate() override`
`61`	`61`	`{`
`62`		`- VERBOSE2("Calibrate.");`
	`62`	`+ SSR_VERBOSE2("Calibrate.");`
`63`	`63`	`Tracker::azi_correction = _current_azimuth + 90;`
`64`	`64`	`}`
`65`	`65`
`@@ -75,7 +75,7 @@ class TrackerVrpn : public Tracker, public vrpn_Tracker_Remote`
`75`	`75`	`/// VRPN callback function`
`76`	`76`	`static void VRPN_CALLBACK handle_tracker(void *userdata, const vrpn_TRACKERCB t);`
`77`	`77`
`78`		`- void update(const Tracker::Tracker_data &_data);`
	`78`	`+ void update(const Tracker::Tracker_data &_data) override;`
`79`	`79`
`80`	`80`	`// thread related stuff`
`81`	`81`	`std::thread _tracker_thread;`