summaryrefslogtreecommitdiff
path: root/libs/evoral/evoral/EventRingBuffer.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-24 02:54:10 +0000
committerDavid Robillard <d@drobilla.net>2012-05-24 02:54:10 +0000
commit27a1cf2cf73703267cac5bda2acca386afb374b3 (patch)
tree122ceba55fef1d183d1b32dca1fd60ffdc113112 /libs/evoral/evoral/EventRingBuffer.hpp
parenteffe4de1889bfefba6550dff4244e06c2c7261bd (diff)
Compile cleanly with clang.
To compile Ardour with LLVM/clang, do the usual thing but set the CXX and CC environment variables, e.g.: CC=/usr/bin/clang CXX=/usr/bin/clang++ ./waf configure build git-svn-id: svn://localhost/ardour2/branches/3.0@12418 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/evoral/EventRingBuffer.hpp')
-rw-r--r--libs/evoral/evoral/EventRingBuffer.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/evoral/evoral/EventRingBuffer.hpp b/libs/evoral/evoral/EventRingBuffer.hpp
index 11d487f778..8fec622243 100644
--- a/libs/evoral/evoral/EventRingBuffer.hpp
+++ b/libs/evoral/evoral/EventRingBuffer.hpp
@@ -47,7 +47,7 @@ public:
EventRingBuffer(size_t capacity) : PBD::RingBufferNPT<uint8_t>(capacity)
{}
- size_t capacity() const { return bufsize(); }
+ inline size_t capacity() const { return bufsize(); }
/** Peek at the ringbuffer (read w/o advancing read pointer).
* @return how much has been peeked (wraps around if read exceeds
@@ -57,10 +57,10 @@ public:
* read-pointer---^
* </pre>
*/
- bool peek (uint8_t*, size_t size);
+ inline bool peek (uint8_t*, size_t size);
- uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf);
- bool read (Time* time, EventType* type, uint32_t* size, uint8_t* buf);
+ inline uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf);
+ inline bool read (Time* time, EventType* type, uint32_t* size, uint8_t* buf);
};
template<typename Time>