From aebbe2287e0e581a15173a0496a6e3bc8fcc8000 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 17 Sep 2017 18:34:18 +0200 Subject: [PATCH] Fix code formatting inconsistencies --- include/MemoryHelper.h | 2 +- include/MemoryManager.h | 10 +++++----- src/core/BufferManager.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/MemoryHelper.h b/include/MemoryHelper.h index 66817b0b740..7bd31bf2b68 100644 --- a/include/MemoryHelper.h +++ b/include/MemoryHelper.h @@ -31,7 +31,7 @@ class MemoryHelper { public: - static void* alignedMalloc(size_t ); + static void* alignedMalloc( size_t ); static void alignedFree( void* ); diff --git a/include/MemoryManager.h b/include/MemoryManager.h index 6554835c7ae..1cc90cb5bda 100644 --- a/include/MemoryManager.h +++ b/include/MemoryManager.h @@ -54,7 +54,7 @@ struct MemoryPool MemoryPool( size_t chunks ) : m_chunks( chunks ) { - m_free = reinterpret_cast(MemoryHelper::alignedMalloc( chunks )); + m_free = reinterpret_cast( MemoryHelper::alignedMalloc( chunks ) ); memset( m_free, 1, chunks ); } @@ -109,17 +109,17 @@ struct MmAllocator typedef T value_type; template< class U > struct rebind { typedef MmAllocator other; }; - T* allocate(std::size_t n) + T* allocate( std::size_t n ) { return reinterpret_cast( MemoryManager::alloc( sizeof(T) * n ) ); } - void deallocate(T* p, std::size_t) + void deallocate( T* p, std::size_t ) { MemoryManager::free( p ); } - typedef std::vector > vector; + typedef std::vector> vector; }; @@ -143,7 +143,7 @@ static void operator delete[] ( void * ptr ) \ } // for use in cases where overriding new/delete isn't a possibility -#define MM_ALLOC( type, count ) reinterpret_cast(MemoryManager::alloc( sizeof( type ) * count )) +#define MM_ALLOC( type, count ) reinterpret_cast( MemoryManager::alloc( sizeof( type ) * count ) ) // and just for symmetry... #define MM_FREE( ptr ) MemoryManager::free( ptr ) diff --git a/src/core/BufferManager.cpp b/src/core/BufferManager.cpp index c7ef51f96d1..6c4a9a32304 100644 --- a/src/core/BufferManager.cpp +++ b/src/core/BufferManager.cpp @@ -40,10 +40,10 @@ void BufferManager::init( fpp_t framesPerPeriod ) sampleFrame * BufferManager::acquire() { - return MM_ALLOC(sampleFrame, ::framesPerPeriod); + return MM_ALLOC( sampleFrame, ::framesPerPeriod ); } -void BufferManager::clear(sampleFrame *ab, const f_cnt_t frames, const f_cnt_t offset) +void BufferManager::clear( sampleFrame *ab, const f_cnt_t frames, const f_cnt_t offset ) { memset( ab + offset, 0, sizeof( *ab ) * frames ); }