From 986e2206e9b73c52f39db30701f5cf3985879338 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 12 Mar 2014 05:05:43 +0000
Subject: [PATCH] Fix build

---
 source/modules/rtmempool/rtmempool.c |  2 ++
 source/utils/CarlaString.hpp         | 13 +++++--------
 source/utils/CarlaUtils.hpp          |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/source/modules/rtmempool/rtmempool.c b/source/modules/rtmempool/rtmempool.c
index 1dbbf5eb0..06bf77f25 100644
--- a/source/modules/rtmempool/rtmempool.c
+++ b/source/modules/rtmempool/rtmempool.c
@@ -16,6 +16,8 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
+#define __THROW
+
 #include "rtmempool.h"
 #include "list.h"
 
diff --git a/source/utils/CarlaString.hpp b/source/utils/CarlaString.hpp
index bdf441559..366ded3ff 100644
--- a/source/utils/CarlaString.hpp
+++ b/source/utils/CarlaString.hpp
@@ -263,14 +263,6 @@ public:
         return (std::strstr(fBuffer, strBuf) != nullptr);
     }
 
-    /*
-     * Overloaded function.
-     */
-    bool contains(const CarlaString& str, const bool ignoreCase = false) const noexcept
-    {
-        return contains(str.fBuffer, ignoreCase);
-    }
-
     /*
      * Check if character at 'pos' is a digit.
      */
@@ -624,6 +616,11 @@ public:
         return CarlaString(newBuf);
     }
 
+    CarlaString operator+(const CarlaString& str) noexcept
+    {
+        return operator+(str.fBuffer);
+    }
+
     // -------------------------------------------------------------------
 
 private:
diff --git a/source/utils/CarlaUtils.hpp b/source/utils/CarlaUtils.hpp
index d57a77dfa..e251b0385 100644
--- a/source/utils/CarlaUtils.hpp
+++ b/source/utils/CarlaUtils.hpp
@@ -305,9 +305,9 @@ void carla_fill(T* data, const size_t size, const T v) noexcept
     CARLA_SAFE_ASSERT_RETURN(data != nullptr,);
     CARLA_SAFE_ASSERT_RETURN(size > 0,);
 
-    if (v == 0 || sizeof(T) == 1)
+    if (v == 0)
     {
-        std::memset(data, v, size*sizeof(T));
+        std::memset(data, 0, size*sizeof(T));
     }
     else
     {