diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-12 18:14:09 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-12 18:14:09 -0400 |
commit | cc543280d9869d4a7b800d547c53e38b13d02cea (patch) | |
tree | aa26b29a02fa43ff24e5c9c777cb5294bf67e8e9 /libs/canvas | |
parent | 10643779b6f039a7458bd0c970ef40ac80ea0568 (diff) |
We were 2 more debug "bits" away from overflow, so recast PBD::DEBUG mechanism away from a 64bit integer and toward std::bitset.
Clean up a few minor related PBD::DEBUG issues along the way
Diffstat (limited to 'libs/canvas')
-rw-r--r-- | libs/canvas/canvas/debug.h | 12 | ||||
-rw-r--r-- | libs/canvas/debug.cc | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libs/canvas/canvas/debug.h b/libs/canvas/canvas/debug.h index b12e337244..ecf7eee46f 100644 --- a/libs/canvas/canvas/debug.h +++ b/libs/canvas/canvas/debug.h @@ -28,12 +28,12 @@ namespace PBD { namespace DEBUG { - LIBCANVAS_API extern uint64_t CanvasItems; - LIBCANVAS_API extern uint64_t CanvasItemsDirtied; - LIBCANVAS_API extern uint64_t CanvasEvents; - LIBCANVAS_API extern uint64_t CanvasRender; - LIBCANVAS_API extern uint64_t CanvasEnterLeave; - LIBCANVAS_API extern uint64_t WaveView; + LIBCANVAS_API extern DebugBits CanvasItems; + LIBCANVAS_API extern DebugBits CanvasItemsDirtied; + LIBCANVAS_API extern DebugBits CanvasEvents; + LIBCANVAS_API extern DebugBits CanvasRender; + LIBCANVAS_API extern DebugBits CanvasEnterLeave; + LIBCANVAS_API extern DebugBits WaveView; } } diff --git a/libs/canvas/debug.cc b/libs/canvas/debug.cc index a7edbfbe54..be5b3a033d 100644 --- a/libs/canvas/debug.cc +++ b/libs/canvas/debug.cc @@ -24,12 +24,12 @@ using namespace std; -uint64_t PBD::DEBUG::CanvasItems = PBD::new_debug_bit ("canvasitems"); -uint64_t PBD::DEBUG::CanvasItemsDirtied = PBD::new_debug_bit ("canvasitemsdirtied"); -uint64_t PBD::DEBUG::CanvasEvents = PBD::new_debug_bit ("canvasevents"); -uint64_t PBD::DEBUG::CanvasRender = PBD::new_debug_bit ("canvasrender"); -uint64_t PBD::DEBUG::CanvasEnterLeave = PBD::new_debug_bit ("canvasenterleave"); -uint64_t PBD::DEBUG::WaveView = PBD::new_debug_bit ("waveview"); +PBD::DebugBits PBD::DEBUG::CanvasItems = PBD::new_debug_bit ("canvasitems"); +PBD::DebugBits PBD::DEBUG::CanvasItemsDirtied = PBD::new_debug_bit ("canvasitemsdirtied"); +PBD::DebugBits PBD::DEBUG::CanvasEvents = PBD::new_debug_bit ("canvasevents"); +PBD::DebugBits PBD::DEBUG::CanvasRender = PBD::new_debug_bit ("canvasrender"); +PBD::DebugBits PBD::DEBUG::CanvasEnterLeave = PBD::new_debug_bit ("canvasenterleave"); +PBD::DebugBits PBD::DEBUG::WaveView = PBD::new_debug_bit ("waveview"); struct timeval ArdourCanvas::epoch; map<string, struct timeval> ArdourCanvas::last_time; |