Browse Source

Fix build

tags/1.9.4
falkTX 10 years ago
parent
commit
986e2206e9
3 changed files with 9 additions and 10 deletions
  1. +2
    -0
      source/modules/rtmempool/rtmempool.c
  2. +5
    -8
      source/utils/CarlaString.hpp
  3. +2
    -2
      source/utils/CarlaUtils.hpp

+ 2
- 0
source/modules/rtmempool/rtmempool.c View File

@@ -16,6 +16,8 @@
* For a full copy of the GNU General Public License see the GPL.txt file * For a full copy of the GNU General Public License see the GPL.txt file
*/ */


#define __THROW

#include "rtmempool.h" #include "rtmempool.h"
#include "list.h" #include "list.h"




+ 5
- 8
source/utils/CarlaString.hpp View File

@@ -263,14 +263,6 @@ public:
return (std::strstr(fBuffer, strBuf) != nullptr); 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. * Check if character at 'pos' is a digit.
*/ */
@@ -624,6 +616,11 @@ public:
return CarlaString(newBuf); return CarlaString(newBuf);
} }


CarlaString operator+(const CarlaString& str) noexcept
{
return operator+(str.fBuffer);
}

// ------------------------------------------------------------------- // -------------------------------------------------------------------


private: private:


+ 2
- 2
source/utils/CarlaUtils.hpp View File

@@ -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(data != nullptr,);
CARLA_SAFE_ASSERT_RETURN(size > 0,); 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 else
{ {


Loading…
Cancel
Save