projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4c7dc0
)
Revert "add operator bool() to Evoral::Beats"
author
Paul Davis
<paul@linuxaudiosystems.com>
Wed, 20 May 2015 14:30:10 +0000
(10:30 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 29 Jun 2015 18:18:14 +0000
(14:18 -0400)
This reverts commit
f8b5263af5e4d5088f1d5551e999679515add432
.
OS X compiler gets confused by this change.
libs/evoral/evoral/Beats.hpp
patch
|
blob
|
history
diff --git
a/libs/evoral/evoral/Beats.hpp
b/libs/evoral/evoral/Beats.hpp
index c419c920f1a3a252d394ca11d1c2ad90039400cb..e0277c4b3d999d4aa36487df2935c46d82ba352f 100644
(file)
--- a/
libs/evoral/evoral/Beats.hpp
+++ b/
libs/evoral/evoral/Beats.hpp
@@
-191,8
+191,6
@@
public:
bool operator!() const { return _time == 0; }
- operator bool() const { return _time != 0; }
-
static Beats min() { return Beats(DBL_MIN); }
static Beats max() { return Beats(DBL_MAX); }
static Beats tick() { return Beats(1.0 / PPQN); }