summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-18 15:52:39 +0000
committerDavid Robillard <d@drobilla.net>2011-05-18 15:52:39 +0000
commit7bd4febfdb799cd359a380d23640654f476dadae (patch)
tree7acf0526548382e3768b45628a47f094120b7724
parent3a1a098d7d41468a74862777d3085f537fb6b894 (diff)
downloadraul-7bd4febfdb799cd359a380d23640654f476dadae.tar.gz
raul-7bd4febfdb799cd359a380d23640654f476dadae.tar.bz2
raul-7bd4febfdb799cd359a380d23640654f476dadae.zip
Strip double blank lines.
git-svn-id: http://svn.drobilla.net/lad/trunk/raul@3279 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--raul/Array.hpp2
-rw-r--r--raul/ArrayStack.hpp2
-rw-r--r--raul/Atom.hpp1
-rw-r--r--raul/AtomLiblo.hpp2
-rw-r--r--raul/AtomRDF.hpp1
-rw-r--r--raul/AtomicInt.hpp2
-rw-r--r--raul/AtomicPtr.hpp2
-rw-r--r--raul/Deletable.hpp2
-rw-r--r--raul/DoubleBuffer.hpp1
-rw-r--r--raul/List.hpp4
-rw-r--r--raul/ListImpl.hpp30
-rw-r--r--raul/MIDISink.hpp2
-rw-r--r--raul/Maid.hpp2
-rw-r--r--raul/Path.hpp2
-rw-r--r--raul/PathTable.hpp1
-rw-r--r--raul/Process.hpp2
-rw-r--r--raul/Quantizer.hpp1
-rw-r--r--raul/SMFReader.hpp2
-rw-r--r--raul/SMFWriter.hpp2
-rw-r--r--raul/SRMWQueue.hpp12
-rw-r--r--raul/SRSWQueue.hpp11
-rw-r--r--raul/Semaphore.hpp2
-rw-r--r--raul/SharedPtr.hpp1
-rw-r--r--raul/Slave.hpp2
-rw-r--r--raul/Symbol.hpp3
-rw-r--r--raul/Table.hpp2
-rw-r--r--raul/TableImpl.hpp15
-rw-r--r--raul/Thread.hpp2
-rw-r--r--raul/TimeSlice.hpp2
-rw-r--r--raul/TimeStamp.hpp7
-rw-r--r--raul/URI.hpp1
-rw-r--r--raul/log.hpp3
-rw-r--r--raul/midi_events.h3
-rw-r--r--raul/midi_names.h3
-rw-r--r--src/Configuration.cpp6
-rw-r--r--src/Maid.cpp4
-rw-r--r--src/Path.cpp9
-rw-r--r--src/SMFReader.cpp9
-rw-r--r--src/SMFWriter.cpp12
-rw-r--r--src/Symbol.cpp3
-rw-r--r--src/Thread.cpp6
-rw-r--r--src/log.cpp4
-rw-r--r--test/atom_test.cpp1
-rw-r--r--test/list_test.cpp1
-rw-r--r--test/quantize_test.cpp1
-rw-r--r--test/queue_test.cpp9
-rw-r--r--test/smf_test.cpp2
-rw-r--r--test/table_test.cpp6
-rw-r--r--test/time_test.cpp1
49 files changed, 0 insertions, 206 deletions
diff --git a/raul/Array.hpp b/raul/Array.hpp
index dc7ebb9..43a2477 100644
--- a/raul/Array.hpp
+++ b/raul/Array.hpp
@@ -25,7 +25,6 @@
namespace Raul {
-
/** An array.
*
* Has a stack-like push_back(), but is NOT a resizeable array (the size given
@@ -101,7 +100,6 @@ private:
T* _elems;
};
-
} // namespace Raul
#endif // RAUL_ARRAY_HPP
diff --git a/raul/ArrayStack.hpp b/raul/ArrayStack.hpp
index d472119..5786ce2 100644
--- a/raul/ArrayStack.hpp
+++ b/raul/ArrayStack.hpp
@@ -27,7 +27,6 @@
namespace Raul {
-
/** An array that can also be used as a stack (with a fixed maximum size).
* \ingroup raul
*/
@@ -70,7 +69,6 @@ private:
size_t _top; // Index of empty element following the top element
};
-
} // namespace Raul
#endif // RAUL_ARRAY_HPP
diff --git a/raul/Atom.hpp b/raul/Atom.hpp
index a65dd8f..4c1ab2e 100644
--- a/raul/Atom.hpp
+++ b/raul/Atom.hpp
@@ -237,7 +237,6 @@ private:
};
};
-
} // namespace Raul
static inline std::ostream& operator<<(std::ostream& os, const Raul::Atom& atom)
diff --git a/raul/AtomLiblo.hpp b/raul/AtomLiblo.hpp
index 2e0bfc9..5e2442e 100644
--- a/raul/AtomLiblo.hpp
+++ b/raul/AtomLiblo.hpp
@@ -69,7 +69,6 @@ lo_message_add_atom(lo_message m, const Atom& atom)
}
}
-
/** Convert a liblo argument to a Raul::Atom */
inline Atom
lo_arg_to_atom(char type, lo_arg* arg)
@@ -94,7 +93,6 @@ lo_arg_to_atom(char type, lo_arg* arg)
}
}
-
} // namespace AtomLiblo
} // namespace Raul
diff --git a/raul/AtomRDF.hpp b/raul/AtomRDF.hpp
index dd0bff4..b5aa0f4 100644
--- a/raul/AtomRDF.hpp
+++ b/raul/AtomRDF.hpp
@@ -138,7 +138,6 @@ atom_to_node(Sord::Model& model, const Atom& atom)
return Sord::Node(world, node);
}
-
} // namespace AtomRDF
} // namespace Raul
diff --git a/raul/AtomicInt.hpp b/raul/AtomicInt.hpp
index e9c355f..4aa6145 100644
--- a/raul/AtomicInt.hpp
+++ b/raul/AtomicInt.hpp
@@ -22,7 +22,6 @@
namespace Raul {
-
/** Atomic integer.
* \ingroup raul
*/
@@ -80,7 +79,6 @@ private:
volatile mutable int _val;
};
-
} // namespace Raul
#endif // RAUL_ATOMIC_INT_HPP
diff --git a/raul/AtomicPtr.hpp b/raul/AtomicPtr.hpp
index 29ba3ec..9c13271 100644
--- a/raul/AtomicPtr.hpp
+++ b/raul/AtomicPtr.hpp
@@ -22,7 +22,6 @@
namespace Raul {
-
/** Atomic pointer.
* \ingroup raul
*/
@@ -50,7 +49,6 @@ private:
mutable volatile gpointer _val;
};
-
} // namespace Raul
#endif // RAUL_ATOMIC_PTR_HPP
diff --git a/raul/Deletable.hpp b/raul/Deletable.hpp
index 7f4bb5a..83ef7d9 100644
--- a/raul/Deletable.hpp
+++ b/raul/Deletable.hpp
@@ -20,7 +20,6 @@
namespace Raul {
-
/** Something with a virtual destructor.
*
* \ingroup raul
@@ -32,7 +31,6 @@ public:
virtual ~Deletable() {}
};
-
} // namespace Raul
#endif // RAUL_DELETABLE_HPP
diff --git a/raul/DoubleBuffer.hpp b/raul/DoubleBuffer.hpp
index f1ed278..7fc29c7 100644
--- a/raul/DoubleBuffer.hpp
+++ b/raul/DoubleBuffer.hpp
@@ -97,7 +97,6 @@ private:
T _vals[2];
};
-
} // namespace Raul
#endif // RAUL_DOUBLE_BUFFER_HPP
diff --git a/raul/List.hpp b/raul/List.hpp
index 8744114..38c4609 100644
--- a/raul/List.hpp
+++ b/raul/List.hpp
@@ -29,7 +29,6 @@
namespace Raul {
-
/** A realtime safe, (partially) thread safe doubly-linked list.
*
* Elements can be added safely while another thread is reading the list.
@@ -71,7 +70,6 @@ public:
AtomicPtr<Node> _next;
};
-
List(size_t size=0, Node* head=NULL, Node* tail=NULL)
: _size(size)
, _end_iter(this)
@@ -125,7 +123,6 @@ public:
const typename List<T>::Node* _listnode;
};
-
/** Realtime safe iterator for a List. */
class iterator {
public:
@@ -171,7 +168,6 @@ private:
const_iterator _const_end_iter;
};
-
} // namespace Raul
#endif // RAUL_LIST_HPP
diff --git a/raul/ListImpl.hpp b/raul/ListImpl.hpp
index e4ade03..c5f9fd3 100644
--- a/raul/ListImpl.hpp
+++ b/raul/ListImpl.hpp
@@ -20,14 +20,12 @@
namespace Raul {
-
template <typename T>
List<T>::~List<T>()
{
clear();
}
-
/** Clear the list, deleting all Nodes contained (but NOT their contents!)
*
* Not realtime safe.
@@ -50,7 +48,6 @@ List<T>::clear()
_size = 0;
}
-
/** Add an element to the list.
*
* Thread safe (may be called while another thread is reading the list).
@@ -76,7 +73,6 @@ List<T>::push_back(Node* const ln)
++_size;
}
-
/** Add an element to the list.
*
* Thread safe (may be called while another thread is reading the list).
@@ -104,7 +100,6 @@ List<T>::push_back(T& elem)
++_size;
}
-
/** Append a list to this list.
*
* This operation is fast ( O(1) ).
@@ -148,7 +143,6 @@ List<T>::append(List<T>& list)
list._size = 0;
}
-
/** Find an element in the list.
*
* This will return the first element equal to @a val found in the list.
@@ -164,7 +158,6 @@ List<T>::find(const T& val)
return end();
}
-
/** Remove an element from the list using an iterator.
*
* This function is realtime safe - it is the caller's responsibility to
@@ -205,7 +198,6 @@ List<T>::erase(const iterator iter)
return n;
}
-
template <typename T>
void
List<T>::chop_front(List<T>& front, size_t front_size, Node* front_tail)
@@ -231,7 +223,6 @@ List<T>::chop_front(List<T>& front, size_t front_size, Node* front_tail)
assert((_head.get() && _tail.get()) || (!_head.get() && !_tail.get()));
}
-
//// Iterator stuff ////
template <typename T>
@@ -241,7 +232,6 @@ List<T>::iterator::iterator(List<T>* list)
{
}
-
template <typename T>
T&
List<T>::iterator::operator*()
@@ -250,7 +240,6 @@ List<T>::iterator::operator*()
return _listnode->elem();
}
-
template <typename T>
T*
List<T>::iterator::operator->()
@@ -259,7 +248,6 @@ List<T>::iterator::operator->()
return &_listnode->elem();
}
-
template <typename T>
inline typename List<T>::iterator&
List<T>::iterator::operator++()
@@ -270,7 +258,6 @@ List<T>::iterator::operator++()
return *this;
}
-
template <typename T>
inline bool
List<T>::iterator::operator!=(const iterator& iter) const
@@ -278,7 +265,6 @@ List<T>::iterator::operator!=(const iterator& iter) const
return (_listnode != iter._listnode);
}
-
template <typename T>
inline bool
List<T>::iterator::operator!=(const const_iterator& iter) const
@@ -286,7 +272,6 @@ List<T>::iterator::operator!=(const const_iterator& iter) const
return (_listnode != iter._listnode);
}
-
template <typename T>
inline bool
List<T>::iterator::operator==(const iterator& iter) const
@@ -294,7 +279,6 @@ List<T>::iterator::operator==(const iterator& iter) const
return (_listnode == iter._listnode);
}
-
template <typename T>
inline bool
List<T>::iterator::operator==(const const_iterator& iter) const
@@ -302,7 +286,6 @@ List<T>::iterator::operator==(const const_iterator& iter) const
return (_listnode == iter._listnode);
}
-
template <typename T>
inline typename List<T>::iterator
List<T>::begin()
@@ -314,7 +297,6 @@ List<T>::begin()
return iter;
}
-
template <typename T>
inline const typename List<T>::iterator
List<T>::end() const
@@ -322,11 +304,8 @@ List<T>::end() const
return _end_iter;
}
-
-
/// const_iterator stuff ///
-
template <typename T>
List<T>::const_iterator::const_iterator(const List<T>* const list)
: _list(list),
@@ -334,7 +313,6 @@ List<T>::const_iterator::const_iterator(const List<T>* const list)
{
}
-
template <typename T>
const T&
List<T>::const_iterator::operator*()
@@ -343,7 +321,6 @@ List<T>::const_iterator::operator*()
return _listnode->elem();
}
-
template <typename T>
const T*
List<T>::const_iterator::operator->()
@@ -352,7 +329,6 @@ List<T>::const_iterator::operator->()
return &_listnode->elem();
}
-
template <typename T>
inline typename List<T>::const_iterator&
List<T>::const_iterator::operator++()
@@ -363,7 +339,6 @@ List<T>::const_iterator::operator++()
return *this;
}
-
template <typename T>
inline bool
List<T>::const_iterator::operator!=(const const_iterator& iter) const
@@ -371,7 +346,6 @@ List<T>::const_iterator::operator!=(const const_iterator& iter) const
return (_listnode != iter._listnode);
}
-
template <typename T>
inline bool
List<T>::const_iterator::operator!=(const iterator& iter) const
@@ -379,7 +353,6 @@ List<T>::const_iterator::operator!=(const iterator& iter) const
return (_listnode != iter._listnode);
}
-
template <typename T>
inline bool
List<T>::const_iterator::operator==(const const_iterator& iter) const
@@ -387,7 +360,6 @@ List<T>::const_iterator::operator==(const const_iterator& iter) const
return (_listnode == iter._listnode);
}
-
template <typename T>
inline bool
List<T>::const_iterator::operator==(const iterator& iter) const
@@ -404,8 +376,6 @@ List<T>::begin() const
return iter;
}
-
} // namespace Raul
-
#endif // RAUL_LIST_IMPL_HPP
diff --git a/raul/MIDISink.hpp b/raul/MIDISink.hpp
index d11929a..f65fabe 100644
--- a/raul/MIDISink.hpp
+++ b/raul/MIDISink.hpp
@@ -24,7 +24,6 @@
namespace Raul {
-
/** Pure virtual base for anything you can write MIDI to.
* \ingroup raul
*/
@@ -35,7 +34,6 @@ public:
const uint8_t* ev) = 0;
};
-
} // namespace Raul
#endif // RAUL_MIDI_SINK_HPP
diff --git a/raul/Maid.hpp b/raul/Maid.hpp
index 4a209f2..3eef6c9 100644
--- a/raul/Maid.hpp
+++ b/raul/Maid.hpp
@@ -26,7 +26,6 @@
namespace Raul {
-
/** Explicitly driven garbage collector.
*
* This is used by realtime threads to allow hard realtime deletion of objects
@@ -69,7 +68,6 @@ private:
Managed _managed;
};
-
} // namespace Raul
#endif // RAUL_MAID_HPP
diff --git a/raul/Path.hpp b/raul/Path.hpp
index 565e759..91122c6 100644
--- a/raul/Path.hpp
+++ b/raul/Path.hpp
@@ -29,7 +29,6 @@
namespace Raul {
-
/** A URI which is a path (for example a filesystem or OSC path).
*
* This enforces that a Path is a valid path, where each fragment is a valid
@@ -216,7 +215,6 @@ private:
inline Path(bool unchecked, const URI& uri) : URI(uri) {}
};
-
} // namespace Raul
#endif // RAUL_PATH_HPP
diff --git a/raul/PathTable.hpp b/raul/PathTable.hpp
index eae6fda..90441ac 100644
--- a/raul/PathTable.hpp
+++ b/raul/PathTable.hpp
@@ -47,7 +47,6 @@ public:
}
};
-
} // namespace Raul
#endif // RAUL_PATH_TABLE_HPP
diff --git a/raul/Process.hpp b/raul/Process.hpp
index 7c7a247..d9ec5e0 100644
--- a/raul/Process.hpp
+++ b/raul/Process.hpp
@@ -31,7 +31,6 @@
namespace Raul {
-
/** A child process.
*
* \ingroup raul
@@ -91,7 +90,6 @@ private:
Process() {}
};
-
} // namespace Raul
#endif // RAUL_PROCESS_HPP
diff --git a/raul/Quantizer.hpp b/raul/Quantizer.hpp
index 75db88a..63c26f2 100644
--- a/raul/Quantizer.hpp
+++ b/raul/Quantizer.hpp
@@ -43,7 +43,6 @@ public:
}
};
-
} // namespace Raul
#endif // RAUL_QUANTIZER_HPP
diff --git a/raul/SMFReader.hpp b/raul/SMFReader.hpp
index 97576a9..4d47319 100644
--- a/raul/SMFReader.hpp
+++ b/raul/SMFReader.hpp
@@ -25,7 +25,6 @@
namespace Raul {
-
/** Standard Midi File (Type 0) Reader
*
* Currently this only reads SMF files with tempo-based timing.
@@ -77,7 +76,6 @@ protected:
uint32_t _track_size;
};
-
} // namespace Raul
#endif // RAUL_SMF_READER_HPP
diff --git a/raul/SMFWriter.hpp b/raul/SMFWriter.hpp
index c70b921..415877d 100644
--- a/raul/SMFWriter.hpp
+++ b/raul/SMFWriter.hpp
@@ -26,7 +26,6 @@
namespace Raul {
-
/** Standard Midi File (Type 0) Writer
* \ingroup raul
*/
@@ -67,7 +66,6 @@ protected:
uint32_t _header_size; ///< size of SMF header, including MTrk chunk header
};
-
} // namespace Raul
#endif // RAUL_SMF_WRITER_HPP
diff --git a/raul/SRMWQueue.hpp b/raul/SRMWQueue.hpp
index b1d5ff2..6680103 100644
--- a/raul/SRMWQueue.hpp
+++ b/raul/SRMWQueue.hpp
@@ -28,7 +28,6 @@
namespace Raul {
-
/** Realtime-safe single-reader multi-writer queue (aka lock-free ringbuffer)
*
* Implemented as a dequeue in a fixed array. Both push and pop are realtime
@@ -57,18 +56,15 @@ public:
explicit SRMWQueue(size_t size);
~SRMWQueue();
-
// Any thread:
inline size_t capacity() const { return _size-1; }
-
// Write thread(s):
inline bool full() const;
inline bool push(const T& obj);
-
// Read thread:
inline bool empty() const;
@@ -89,7 +85,6 @@ private:
AtomicInt* const _valid; ///< Parallel array to _objects, whether loc is written or not
};
-
template<typename T>
SRMWQueue<T>::SRMWQueue(size_t size)
: _front(0)
@@ -108,14 +103,12 @@ SRMWQueue<T>::SRMWQueue(size_t size)
}
}
-
template <typename T>
SRMWQueue<T>::~SRMWQueue()
{
free(_objects);
}
-
/** Return whether the queue is full.
*
* Write thread(s) only.
@@ -127,7 +120,6 @@ SRMWQueue<T>::full() const
return (_write_space.get() <= 0);
}
-
/** Push an item onto the back of the SRMWQueue - realtime-safe, not thread-safe.
*
* Write thread(s) only.
@@ -169,7 +161,6 @@ SRMWQueue<T>::push(const T& elem)
}
}
-
/** Return whether the queue is empty.
*
* Read thread only.
@@ -181,7 +172,6 @@ SRMWQueue<T>::empty() const
return (_valid[_front].get() == 0);
}
-
/** Return the element at the front of the queue without removing it.
*
* It is a fatal error to call front() when the queue is empty.
@@ -194,7 +184,6 @@ SRMWQueue<T>::front() const
return _objects[_front];
}
-
/** Pop an item off the front of the queue - realtime-safe, NOT thread-safe.
*
* It is a fatal error to call pop() if the queue is empty.
@@ -217,7 +206,6 @@ SRMWQueue<T>::pop()
++_write_space;
}
-
} // namespace Raul
#endif // RAUL_SRMW_QUEUE_HPP
diff --git a/raul/SRSWQueue.hpp b/raul/SRSWQueue.hpp
index d87b431..80758d2 100644
--- a/raul/SRSWQueue.hpp
+++ b/raul/SRSWQueue.hpp
@@ -26,7 +26,6 @@
namespace Raul {
-
/** Realtime-safe single-reader single-writer queue (aka lock-free ringbuffer)
*
* This is appropriate for a cross-thread queue of fixed size object. If you
@@ -51,13 +50,11 @@ public:
inline size_t capacity() const { return _size-1; }
-
// Write thread(s):
inline bool full() const;
inline bool push(const T& obj);
-
// Read thread:
inline bool empty() const;
@@ -71,7 +68,6 @@ private:
T* const _objects; ///< Fixed array containing queued elements
};
-
template<typename T>
SRSWQueue<T>::SRSWQueue(size_t size)
: _front(0)
@@ -82,14 +78,12 @@ SRSWQueue<T>::SRSWQueue(size_t size)
assert(size > 1);
}
-
template <typename T>
SRSWQueue<T>::~SRSWQueue()
{
delete[] _objects;
}
-
/** Return whether or not the queue is empty.
*/
template <typename T>
@@ -99,7 +93,6 @@ SRSWQueue<T>::empty() const
return (_back.get() == _front.get());
}
-
/** Return whether or not the queue is full.
*/
template <typename T>
@@ -109,7 +102,6 @@ SRSWQueue<T>::full() const
return (((_front.get() - _back.get() + _size) % _size) == 1);
}
-
/** Return the element at the front of the queue without removing it
*/
template <typename T>
@@ -119,7 +111,6 @@ SRSWQueue<T>::front() const
return _objects[_front.get()];
}
-
/** Push an item onto the back of the SRSWQueue - realtime-safe, not thread-safe.
*
* @returns true if @a elem was successfully pushed onto the queue,
@@ -139,7 +130,6 @@ SRSWQueue<T>::push(const T& elem)
}
}
-
/** Pop an item off the front of the queue - realtime-safe, not thread-safe.
*
* It is a fatal error to call pop() when the queue is empty.
@@ -156,7 +146,6 @@ SRSWQueue<T>::pop()
_front = (_front.get() + 1) % (_size);
}
-
} // namespace Raul
#endif // RAUL_SRSW_QUEUE_HPP
diff --git a/raul/Semaphore.hpp b/raul/Semaphore.hpp
index 4b8386d..63738c2 100644
--- a/raul/Semaphore.hpp
+++ b/raul/Semaphore.hpp
@@ -29,7 +29,6 @@
namespace Raul {
-
/** Counting semaphore.
*
* \ingroup raul
@@ -116,7 +115,6 @@ private:
#endif
};
-
} // namespace Raul
#endif // RAUL_SEMAPHORE_HPP
diff --git a/raul/SharedPtr.hpp b/raul/SharedPtr.hpp
index 4a02f41..ef4fea8 100644
--- a/raul/SharedPtr.hpp
+++ b/raul/SharedPtr.hpp
@@ -40,7 +40,6 @@ namespace boost {
}
#endif // BOOST_SP_ENABLE_DEBUG_HOOKS
-
#include <boost/shared_ptr.hpp>
#ifdef BOOST_AC_USE_PTHREADS
diff --git a/raul/Slave.hpp b/raul/Slave.hpp
index 7d5ebf4..a301bc4 100644
--- a/raul/Slave.hpp
+++ b/raul/Slave.hpp
@@ -24,7 +24,6 @@
namespace Raul {
-
/** Thread driven by (realtime safe) signals.
*
* Use this to perform some task in a separate thread you want to 'drive'
@@ -60,7 +59,6 @@ private:
}
};
-
} // namespace Raul
#endif // RAUL_SLAVE_HPP
diff --git a/raul/Symbol.hpp b/raul/Symbol.hpp
index eecf1fd..aaf2935 100644
--- a/raul/Symbol.hpp
+++ b/raul/Symbol.hpp
@@ -28,7 +28,6 @@
namespace Raul {
-
/** A restricted string (C identifier, which is a component of a Path).
*
* A Symbol is a very restricted string suitable for use as an identifier.
@@ -53,7 +52,6 @@ public:
assert(is_valid(symbol));
}
-
/** Construct a Symbol from a C string.
*
* It is a fatal error to construct a Symbol from an invalid string,
@@ -87,7 +85,6 @@ private:
const char* _str;
};
-
} // namespace Raul
static inline std::ostream& operator<<(std::ostream& os, const Raul::Symbol& symbol)
diff --git a/raul/Table.hpp b/raul/Table.hpp
index 431f75d..55b42f8 100644
--- a/raul/Table.hpp
+++ b/raul/Table.hpp
@@ -30,7 +30,6 @@
namespace Raul {
-
/** Slow insertion, fast lookup, cache optimized, super fast sorted iteration.
*
* This has the advantage over std::map that iterating over the collection
@@ -120,7 +119,6 @@ private:
std::vector<Entry> _entries;
};
-
} // namespace Raul
#endif // RAUL_TABLE_HPP
diff --git a/raul/TableImpl.hpp b/raul/TableImpl.hpp
index 029723d..e1ba32d 100644
--- a/raul/TableImpl.hpp
+++ b/raul/TableImpl.hpp
@@ -51,7 +51,6 @@ Table<K,T>::is_sorted() const
}
#endif
-
/** Binary search (O(log(n))) */
template <typename K, typename T>
typename Table<K,T>::const_iterator
@@ -60,7 +59,6 @@ Table<K,T>::find(const K& key) const
return ((Table<K,T>*)this)->find(key);
}
-
/** Binary search (O(log(n))) */
template <typename K, typename T>
typename Table<K,T>::iterator
@@ -69,7 +67,6 @@ Table<K,T>::find(const K& key)
return find(begin(), end(), key);
}
-
/** Binary search (O(log(end - start))) */
template <typename K, typename T>
typename Table<K,T>::const_iterator
@@ -78,7 +75,6 @@ Table<K,T>::find(const_iterator start, const_iterator finish, const K& key) cons
return ((Table<K,T>*)this)->find(start, finish, key);
}
-
/** Binary search (O(log(end - start))) */
template <typename K, typename T>
typename Table<K,T>::iterator
@@ -108,7 +104,6 @@ Table<K,T>::find(const_iterator start, const_iterator finish, const K& key)
return end();
}
-
/** Find the end of a range using a custom comparator.
* Two entries a, b are considered in the range if comp(a, b) returns true.
*
@@ -128,7 +123,6 @@ Table<K,T>::find_range_end(const_iterator start, bool (*comp)(const K&,const K&)
return (const_cast<Table<K, T>&>(*this)).find_range_end(*((iterator*)&start), comp);
}
-
/** Find the end of a range using a custom comparator.
* Two entries a, b are considered in the range if comp(a, b) returns true.
*
@@ -197,7 +191,6 @@ Table<K,T>::find_range_end(iterator start, bool (*comp)(const K&,const K&))
return iterator(*this, lower+1);
}
-
/** Erase and return a range of entries */
template <typename K, typename T>
SharedPtr< Table<K, T> >
@@ -210,7 +203,6 @@ Table<K, T>::yank(iterator start, iterator end)
return ret;
}
-
/** Cram a range of entries back in.
* Range MUST follow the same ordering guidelines as find_range_end.
* Return type is the same as insert, iterator points to first inserted entry */
@@ -252,7 +244,6 @@ Table<K, T>::cram(const Table<K,T>& range)
return make_pair(iterator(*this, insert_index), true);
}
-
/** Add an item to the table, using \a entry.first as the search key.
* An iterator to the element where value was set is returned, and a bool which
* is true if an insertion took place, or false if an existing entry was updated.
@@ -322,7 +313,6 @@ Table<K,T>::insert(const std::pair<K, T>& entry)
return std::make_pair(iterator(*this, i), true);
}
-
/** Insert an item, and return a reference to it's value.
*
* This may be used to insert values with pretty syntax:
@@ -344,7 +334,6 @@ Table<K, T>::operator[](const K& key)
}
}
-
template <typename K, typename T>
void
Table<K,T>::erase(const K& key)
@@ -352,7 +341,6 @@ Table<K,T>::erase(const K& key)
erase(find(key));
}
-
template <typename K, typename T>
void
Table<K,T>::erase(iterator i)
@@ -373,7 +361,6 @@ Table<K,T>::erase(iterator i)
#endif
}
-
/** Erase a range of elements from \a first to \a last, including first but
* not including last.
*/
@@ -387,7 +374,6 @@ Table<K,T>::erase(iterator first, iterator last)
Table<K,T>::erase_by_index(first_index, last_index);
}
-
/** Erase a range of elements from \a first_index to \a last_index, including
* first_index but not including last_index.
*/
@@ -408,7 +394,6 @@ Table<K,T>::erase_by_index(size_t first_index, size_t last_index)
#endif
}
-
} // namespace Raul
#endif // RAUL_TABLE_IMLP_HPP
diff --git a/raul/Thread.hpp b/raul/Thread.hpp
index 7168f18..0f5761d 100644
--- a/raul/Thread.hpp
+++ b/raul/Thread.hpp
@@ -28,7 +28,6 @@
namespace Raul {
-
/** Abstract base class for a thread.
*
* Extend this and override the _run method to easily create a thread
@@ -104,7 +103,6 @@ private:
pthread_t _pthread;
};
-
} // namespace Raul
#endif // RAUL_THREAD_HPP
diff --git a/raul/TimeSlice.hpp b/raul/TimeSlice.hpp
index 1af7245..5e7613e 100644
--- a/raul/TimeSlice.hpp
+++ b/raul/TimeSlice.hpp
@@ -27,7 +27,6 @@
namespace Raul {
-
/* FIXME: all the conversion here is wrong now */
/** A duration of time, with conversion between tick time and beat time.
@@ -154,7 +153,6 @@ private:
TimeDuration _offset_ticks; ///< Offset to global time (ie Jack sub-cycle offset)
};
-
} // namespace Raul
#endif // RAUL_TIME_SLICE_HPP
diff --git a/raul/TimeStamp.hpp b/raul/TimeStamp.hpp
index f9dd588..8bdb49e 100644
--- a/raul/TimeStamp.hpp
+++ b/raul/TimeStamp.hpp
@@ -26,7 +26,6 @@
namespace Raul {
-
/** A type of time stamp
* \ingroup raul
*/
@@ -67,7 +66,6 @@ private:
uint32_t _ppt;
};
-
/** A real-time time stamp (possible units: frame, absolute (s), or beat).
*
* This is a uint32_t:uint32_t fixed point representation, capable of
@@ -194,7 +192,6 @@ private:
TimeUnit _unit;
};
-
static inline std::ostream&
operator<<(std::ostream& os, const TimeStamp& t)
{
@@ -213,7 +210,6 @@ operator<<(std::ostream& os, const TimeStamp& t)
return os;
}
-
class FrameStamp : public TimeStamp {
public:
inline FrameStamp(uint32_t rate, uint32_t ticks=0, uint32_t subticks=0)
@@ -221,7 +217,6 @@ public:
{}
};
-
class BeatStamp : public TimeStamp {
public:
inline BeatStamp(uint32_t ppqn, uint32_t ticks=0, uint32_t subticks=0)
@@ -229,12 +224,10 @@ public:
{}
};
-
/** Same thing as TimeStamp really, but makes code clearer and enforces
* correct semantics via type safety */
typedef TimeStamp TimeDuration;
-
} // namespace Raul
#endif // RAUL_TIME_STAMP_HPP
diff --git a/raul/URI.hpp b/raul/URI.hpp
index 210c44e..569be41 100644
--- a/raul/URI.hpp
+++ b/raul/URI.hpp
@@ -27,7 +27,6 @@
namespace Raul {
-
/** Simple wrapper around standard string with useful URI-specific methods.
*
* This "should" be used for proper URIs (RFC3986), but not much support or
diff --git a/raul/log.hpp b/raul/log.hpp
index 6237325..cbc9f14 100644
--- a/raul/log.hpp
+++ b/raul/log.hpp
@@ -78,7 +78,6 @@ private:
std::ostream& _out;
};
-
class NullBuffer : public std::streambuf
{
protected:
@@ -86,13 +85,11 @@ protected:
int sync() { return 0; }
};
-
extern std::ostream info;
extern std::ostream warn;
extern std::ostream error;
extern std::ostream debug;
-
} // namespace Raul
#endif // RAUL_LOG_HPP
diff --git a/raul/midi_events.h b/raul/midi_events.h
index 63a69fb..da28b9c 100644
--- a/raul/midi_events.h
+++ b/raul/midi_events.h
@@ -25,14 +25,12 @@
#ifndef RAUL_MIDI_EVENTS_H
#define RAUL_MIDI_EVENTS_H
-
/**
* \defgroup midi MIDI Definitions
* MIDI command and controller number definitions.
* \{
*/
-
// Controllers
#define MIDI_CTL_MSB_BANK 0x00 /**< Bank Selection */
#define MIDI_CTL_MSB_MODWHEEL 0x01 /**< Modulation */
@@ -131,7 +129,6 @@
//@}
-
/** \} */
#endif /* RAUL_MIDI_EVENTS_H */
diff --git a/raul/midi_names.h b/raul/midi_names.h
index d5b0a38..97604a1 100644
--- a/raul/midi_names.h
+++ b/raul/midi_names.h
@@ -27,7 +27,6 @@ namespace Raul {
extern "C" {
#endif
-
/** Pass this a symbol defined in midi_events.h (e.g. MIDI_CTL_PAN) to get the
* short name of a MIDI event/controller according to General MIDI.
* \ingroup midi
@@ -227,11 +226,9 @@ inline static const char* midi_name(uint8_t status)
}
}
-
#ifdef __cplusplus
} // extern "C"
} // namespace Raul
#endif
-
#endif /* RAUL_MIDI_NAMES_H */
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index e1d8377..baf4e2a 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -25,7 +25,6 @@ using std::string;
namespace Raul {
-
/** Add a configuration option.
*
* @param name Long name (without leading "--")
@@ -50,7 +49,6 @@ Configuration::add(
return *this;
}
-
void
Configuration::print_usage(const std::string& program, std::ostream& os)
{
@@ -71,7 +69,6 @@ Configuration::print_usage(const std::string& program, std::ostream& os)
}
}
-
int
Configuration::set_value_from_string(Configuration::Option& option, const std::string& value)
throw (Configuration::CommandLineError)
@@ -97,7 +94,6 @@ Configuration::set_value_from_string(Configuration::Option& option, const std::s
return EXIT_SUCCESS;
}
-
/** Parse command line arguments. */
void
Configuration::parse(int argc, char** argv) throw (Configuration::CommandLineError)
@@ -144,7 +140,6 @@ Configuration::parse(int argc, char** argv) throw (Configuration::CommandLineErr
}
}
-
void
Configuration::print(std::ostream& os, const std::string mime_type) const
{
@@ -154,7 +149,6 @@ Configuration::print(std::ostream& os, const std::string mime_type) const
}
}
-
const Raul::Atom&
Configuration::option(const std::string& long_name)
{
diff --git a/src/Maid.cpp b/src/Maid.cpp
index 7403dbd..8bab395 100644
--- a/src/Maid.cpp
+++ b/src/Maid.cpp
@@ -21,13 +21,11 @@
namespace Raul {
-
Maid::Maid(size_t size)
: _objects(size)
{
}
-
Maid::~Maid()
{
cleanup();
@@ -44,7 +42,6 @@ Maid::manage(SharedPtr<Raul::Deletable> ptr)
_managed.push_back(new Raul::List<SharedPtr<Raul::Deletable> >::Node(ptr));
}
-
/** Free all the objects in the queue (passed by push()).
*/
void
@@ -70,5 +67,4 @@ Maid::cleanup()
}
-
} // namespace Raul
diff --git a/src/Path.cpp b/src/Path.cpp
index 4fbaa58..fff4fbd 100644
--- a/src/Path.cpp
+++ b/src/Path.cpp
@@ -36,7 +36,6 @@ Path::is_path(const Raul::URI& uri)
&& Path::is_valid(uri.str());
}
-
Path::Path(const std::basic_string<char>& path)
: URI(path[0] == '/' ? root_uri.str() + path.substr(1) : path)
{
@@ -44,7 +43,6 @@ Path::Path(const std::basic_string<char>& path)
throw BadPath(str());
}
-
Path::Path(const char* cpath)
: URI(cpath[0] == '/' ? root_uri.str() + (cpath + 1) : cpath)
{
@@ -52,7 +50,6 @@ Path::Path(const char* cpath)
throw BadPath(str());
}
-
bool
Path::is_valid(const std::basic_string<char>& path_str)
{
@@ -99,7 +96,6 @@ Path::is_valid(const std::basic_string<char>& path_str)
return true;
}
-
/** Convert a string to a valid full path.
*
* The returned string is a valid relative path without the root prefix,
@@ -134,7 +130,6 @@ Path::pathify(const std::basic_string<char>& str)
return path;
}
-
/** Convert a string to a valid name (or "method" - tokens between slashes)
*
* This will strip all slashes, etc, and always return a valid name/method.
@@ -154,7 +149,6 @@ Path::nameify(const std::basic_string<char>& str)
return name;
}
-
/** Replace any invalid characters in @a str with a suitable replacement.
*/
void
@@ -203,7 +197,6 @@ Path::replace_invalid_chars(std::string& str, size_t start, bool replace_slash)
str = prefix + str;
}
-
bool
Path::is_child_of(const Path& parent) const
{
@@ -211,13 +204,11 @@ Path::is_child_of(const Path& parent) const
return (substr(0, parent_base.length()) == parent_base);
}
-
bool
Path::is_parent_of(const Path& child) const
{
return child.is_child_of(*this);
}
-
} // namespace Raul
diff --git a/src/SMFReader.cpp b/src/SMFReader.cpp
index 1a75074..468738b 100644
--- a/src/SMFReader.cpp
+++ b/src/SMFReader.cpp
@@ -30,7 +30,6 @@ using std::endl;
namespace Raul {
-
/** Return the size of the given event NOT including the status byte,
* or -1 if unknown (eg sysex)
*/
@@ -73,7 +72,6 @@ midi_event_size(unsigned char status)
return -1;
}
-
SMFReader::SMFReader(const std::string filename)
: _fd(NULL)
, _ppqn(0)
@@ -84,14 +82,12 @@ SMFReader::SMFReader(const std::string filename)
open(filename);
}
-
SMFReader::~SMFReader()
{
if (_fd)
close();
}
-
bool
SMFReader::open(const std::string& filename) throw (std::logic_error, UnsupportedTime)
{
@@ -143,7 +139,6 @@ SMFReader::open(const std::string& filename) throw (std::logic_error, Unsupporte
}
}
-
/** Seek to the start of a given track, starting from 1.
* Returns true if specified track was found.
*/
@@ -191,7 +186,6 @@ SMFReader::seek_to_track(unsigned track) throw (std::logic_error)
}
}
-
/** Read an event from the current position in file.
*
* File position MUST be at the beginning of a delta time, or this will die very messily.
@@ -284,7 +278,6 @@ SMFReader::read_event(size_t buf_len,
}
}
-
void
SMFReader::close()
{
@@ -294,7 +287,6 @@ SMFReader::close()
_fd = NULL;
}
-
uint32_t
SMFReader::read_var_len(FILE* fd) throw (PrematureEOF)
{
@@ -316,6 +308,5 @@ SMFReader::read_var_len(FILE* fd) throw (PrematureEOF)
return value;
}
-
} // namespace Raul
diff --git a/src/SMFWriter.cpp b/src/SMFWriter.cpp
index 221c976..518658d 100644
--- a/src/SMFWriter.cpp
+++ b/src/SMFWriter.cpp
@@ -32,7 +32,6 @@ using std::endl;
namespace Raul {
-
/** Create a new SMF writer.
*
* @a unit must match the time stamp of ALL events passed to write, or
@@ -52,14 +51,12 @@ SMFWriter::SMFWriter(TimeUnit unit)
assert(unit.ppt() < std::numeric_limits<uint16_t>::max());
}
-
SMFWriter::~SMFWriter()
{
if (_fd)
finish();
}
-
/** Start a write to an SMF file.
*
* @a filename Filename to write to.
@@ -89,7 +86,6 @@ SMFWriter::start(const std::string& filename,
return (_fd == 0) ? -1 : 0;
}
-
/** Write an event at the end of the file.
*
* @a time is the absolute time of the event, relative to the start of the file
@@ -136,7 +132,6 @@ SMFWriter::write_event(Raul::TimeStamp time,
_track_size += stamp_size + ev_size;
}
-
void
SMFWriter::flush()
{
@@ -144,7 +139,6 @@ SMFWriter::flush()
fflush(_fd);
}
-
void
SMFWriter::finish() throw (std::logic_error)
{
@@ -156,7 +150,6 @@ SMFWriter::finish() throw (std::logic_error)
_fd = NULL;
}
-
void
SMFWriter::write_header()
{
@@ -182,7 +175,6 @@ SMFWriter::write_header()
write_chunk_header("MTrk", _track_size);
}
-
void
SMFWriter::write_footer()
{
@@ -194,7 +186,6 @@ SMFWriter::write_footer()
fwrite(eot, 1, 4, _fd);
}
-
void
SMFWriter::write_chunk_header(const char id[4], uint32_t length)
{
@@ -204,7 +195,6 @@ SMFWriter::write_chunk_header(const char id[4], uint32_t length)
fwrite(&length_be, 4, 1, _fd);
}
-
void
SMFWriter::write_chunk(const char id[4], uint32_t length, void* data)
{
@@ -213,7 +203,6 @@ SMFWriter::write_chunk(const char id[4], uint32_t length, void* data)
fwrite(data, 1, length, _fd);
}
-
/** Write an SMF variable length value.
*
* @return size (in bytes) of the value written.
@@ -243,6 +232,5 @@ SMFWriter::write_var_len(uint32_t value)
return ret;
}
-
} // namespace Raul
diff --git a/src/Symbol.cpp b/src/Symbol.cpp
index f16fef1..53060c6 100644
--- a/src/Symbol.cpp
+++ b/src/Symbol.cpp
@@ -24,7 +24,6 @@ using std::string;
namespace Raul {
-
bool
Symbol::is_valid(const std::basic_string<char>& symbol)
{
@@ -50,7 +49,6 @@ Symbol::is_valid(const std::basic_string<char>& symbol)
return true;
}
-
/** Convert a string to a valid symbol.
*
* This will make a best effort at turning @a str into a complete, valid
@@ -71,6 +69,5 @@ Symbol::symbolify(const std::basic_string<char>& str)
return symbol;
}
-
} // namespace Raul
diff --git a/src/Thread.cpp b/src/Thread.cpp
index 8c89707..78edacc 100644
--- a/src/Thread.cpp
+++ b/src/Thread.cpp
@@ -31,7 +31,6 @@ namespace Raul {
pthread_once_t Thread::_thread_key_once = PTHREAD_ONCE_INIT;
pthread_key_t Thread::_thread_key;
-
Thread::Thread(const std::string& name)
: _exit_flag(false)
, _name(name)
@@ -42,7 +41,6 @@ Thread::Thread(const std::string& name)
pthread_setspecific(_thread_key, this);
}
-
/** Must be called from thread */
Thread::Thread(pthread_t thread, const std::string& name)
: _exit_flag(false)
@@ -55,7 +53,6 @@ Thread::Thread(pthread_t thread, const std::string& name)
pthread_setspecific(_thread_key, this);
}
-
/** Return the calling thread.
* The return value of this should NOT be cached unless the thread is
* explicitly user created with create().
@@ -70,7 +67,6 @@ Thread::get()
return *this_thread;
}
-
void*
Thread::_static_run(void* thread)
{
@@ -81,7 +77,6 @@ Thread::_static_run(void* thread)
return NULL;
}
-
/** Launch and start the thread. */
void
Thread::start()
@@ -140,6 +135,5 @@ Thread::set_scheduling(int policy, unsigned int priority)
}
}
-
} // namespace Raul
diff --git a/src/log.cpp b/src/log.cpp
index 5a1ea8a..12f6139 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -51,7 +51,6 @@ std::ostream warn(&warn_buffer);
std::ostream error(&error_buffer);
std::ostream debug(&debug_buffer);
-
std::string
Raul::LogBuffer::colour(Colour c)
{
@@ -60,14 +59,12 @@ Raul::LogBuffer::colour(Colour c)
return ss.str();
}
-
std::string
Raul::LogBuffer::plain()
{
return "\033[0m";
}
-
void
Raul::LogBuffer::emit()
{
@@ -83,5 +80,4 @@ Raul::LogBuffer::emit()
_line.clear();
}
-
} // namespace Raul
diff --git a/test/atom_test.cpp b/test/atom_test.cpp
index 5174600..66bc79e 100644
--- a/test/atom_test.cpp
+++ b/test/atom_test.cpp
@@ -9,7 +9,6 @@ main()
static const size_t buf_size = 9;
char buf[buf_size] = "atomtest";
-
Atom nil_atom();
Atom int_atom(42);
Atom float_atom(42.0f);
diff --git a/test/list_test.cpp b/test/list_test.cpp
index e6b6641..4e0f45f 100644
--- a/test/list_test.cpp
+++ b/test/list_test.cpp
@@ -124,7 +124,6 @@ main()
CHECK(*i == idx + 1);
}
-
// Appending an empty list
l2.clear();
l.append(l2);
diff --git a/test/quantize_test.cpp b/test/quantize_test.cpp
index a3c30de..9d7e539 100644
--- a/test/quantize_test.cpp
+++ b/test/quantize_test.cpp
@@ -4,7 +4,6 @@
using namespace std;
using namespace Raul;
-
int
main()
{
diff --git a/test/queue_test.cpp b/test/queue_test.cpp
index 5c2209b..195f763 100644
--- a/test/queue_test.cpp
+++ b/test/queue_test.cpp
@@ -27,7 +27,6 @@ struct Record {
Record data[NUM_DATA];
-
// Actions pumped through the queue to manipulate data
struct WriteAction {
WriteAction(unsigned idx) : index(idx) {}
@@ -39,11 +38,9 @@ struct WriteAction {
unsigned index;
};
-
// The victim
SRMWQueue<WriteAction> queue(QUEUE_SIZE);
-
class WriteThread : public Thread {
protected:
void _run() {
@@ -67,7 +64,6 @@ protected:
}
};
-
// Returns 0 if all read count/write count pairs are equal,
// otherwise how far off total count was
unsigned
@@ -82,7 +78,6 @@ data_is_sane()
return ret;
}
-
void
dump_data()
{
@@ -96,7 +91,6 @@ dump_data()
}
}
-
int
main()
{
@@ -177,7 +171,6 @@ main()
if (leftovers > 0)
cout << "Processed " << leftovers << " leftovers." << endl;
-
//cout << "\n\n*********************************************\n\n";
cout << "Total processed: " << total_processed << endl;
@@ -186,7 +179,6 @@ main()
else
cout << "(Counter did NOT have to wrap)" << endl;
-
const unsigned diff = data_is_sane();
if (diff == 0) {
@@ -201,7 +193,6 @@ main()
return 0;
}
-
#if 0
int main()
{
diff --git a/test/smf_test.cpp b/test/smf_test.cpp
index e848f15..bc9b756 100644
--- a/test/smf_test.cpp
+++ b/test/smf_test.cpp
@@ -7,7 +7,6 @@
using namespace std;
using namespace Raul;
-
int
main(int argc, char** argv)
{
@@ -30,7 +29,6 @@ main(int argc, char** argv)
filename = argv[1];
}
-
SMFReader reader;
bool opened = reader.open(filename);
diff --git a/test/table_test.cpp b/test/table_test.cpp
index 5d370fd..1bb33d0 100644
--- a/test/table_test.cpp
+++ b/test/table_test.cpp
@@ -224,7 +224,6 @@ random_string()
return ret;
}
-
void
benchmark(size_t n)
{
@@ -246,7 +245,6 @@ benchmark(size_t n)
t2.tv_sec=0;
t2.tv_usec=0;
-
/** std::map **/
std::map<string,int> m;
@@ -273,7 +271,6 @@ benchmark(size_t n)
cout << "std::map time to lookup " << n << " values: \t" << delta_t << endl;
-
/** std::set **/
std::set<std::string> s;
@@ -300,7 +297,6 @@ benchmark(size_t n)
cout << "std::set time to lookup " << n << " values: \t" << delta_t << endl;
-
/** sorted std::vector **/
/*std::vector<int> v;
@@ -329,7 +325,6 @@ benchmark(size_t n)
cout << "std::vector (sorted) time to lookup " << n << " values: \t" << delta_t << endl;*/
-
/** Raul::Table **/
Raul::Table<string,int> t(n);
@@ -356,7 +351,6 @@ benchmark(size_t n)
cout << "Raul::Table time to lookup " << n << " values: \t" << delta_t << endl;
-
#ifdef WITH_TR1
/** boost::hash && std::unordered_map **/
diff --git a/test/time_test.cpp b/test/time_test.cpp
index b48e3f1..d7b6d81 100644
--- a/test/time_test.cpp
+++ b/test/time_test.cpp
@@ -5,7 +5,6 @@
using namespace std;
using namespace Raul;
-
int
main()
{