From e21c00e9b73014c9b09b2cfe649d87d2cb6217ba Mon Sep 17 00:00:00 2001 From: Lukas W Date: Mon, 4 May 2020 18:00:47 +0200 Subject: [PATCH] Apply suggestions by @PhysSong --- include/MemoryPool.h | 2 +- plugins/CMakeLists.txt | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/MemoryPool.h b/include/MemoryPool.h index 1166a5a6f..d81550137 100644 --- a/include/MemoryPool.h +++ b/include/MemoryPool.h @@ -39,7 +39,7 @@ public: using value_type = T; template struct rebind { typedef MemoryPool other; }; - MemoryPool(size_t nmemb) : _MemoryPool_Base(sizeof(T), nmemb) {} + MemoryPool(size_t nmemb) : _MemoryPool_Base(sizeof(T), nmemb) {} T * allocate(size_t n = 1) { diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index fe8a5faa9..4f139f8b3 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -9,13 +9,6 @@ IF(LMMS_BUILD_APPLE) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") ENDIF() -IF(MINGW_PREFIX) - # There's a bug in some CMake or MinGW versions that passes -std=c++11 when - # compiling C files (e.g. fmopl.c). Remove -Werror for plugins to work - # around this. - STRING(REPLACE "-Werror " "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) -ENDIF() - INCLUDE_DIRECTORIES( ${SAMPLERATE_INCLUDE_DIRS} "${CMAKE_BINARY_DIR}/src"