mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-10 04:22:20 +02:00
Initial macOS changes
Many changes are related to fixing warnings
This commit is contained in:
parent
75f11b1459
commit
22ec4a86b8
52 changed files with 2873 additions and 266 deletions
|
@ -137,6 +137,21 @@ public:
|
|||
{
|
||||
return mPtr < val2.mPtr;
|
||||
}
|
||||
|
||||
bool operator>(const iterator& val2) const
|
||||
{
|
||||
return mPtr > val2.mPtr;
|
||||
}
|
||||
|
||||
bool operator<=(const iterator& val2) const
|
||||
{
|
||||
return mPtr <= val2.mPtr;
|
||||
}
|
||||
|
||||
bool operator>=(const iterator& val2) const
|
||||
{
|
||||
return mPtr >= val2.mPtr;
|
||||
}
|
||||
};
|
||||
|
||||
struct const_iterator
|
||||
|
@ -1041,7 +1056,7 @@ class Array : public ArrayImpl<T, TAlloc, std::is_pod<T>::value>
|
|||
public:
|
||||
typedef ArrayImpl<T, TAlloc, std::is_pod<T>::value> _ArrayImpl;
|
||||
|
||||
using _ArrayImpl::ArrayImpl;
|
||||
using ArrayImpl<T, TAlloc, std::is_pod<T>::value>::ArrayImpl;
|
||||
using _ArrayImpl::operator=;
|
||||
using _ArrayImpl::operator==;
|
||||
using _ArrayImpl::operator!=;
|
||||
|
|
|
@ -17,6 +17,14 @@ typedef fd_set FD_SET;
|
|||
#define closesocket close
|
||||
#endif
|
||||
|
||||
#ifdef BF_PLATFORM_OSX
|
||||
#include <sys/socket.h>
|
||||
#include <mach/error.h>
|
||||
#include <mach/mach.h>
|
||||
#include <cerrno>
|
||||
//#define errno (*__error())
|
||||
#endif
|
||||
|
||||
//#include <rpcdce.h>
|
||||
|
||||
#pragma comment(lib,"wsock32.lib")
|
||||
|
|
|
@ -1049,7 +1049,7 @@ class Deque : public DequeImpl<T, TAlloc, std::is_pod<T>::value>
|
|||
public:
|
||||
typedef DequeImpl<T, TAlloc, std::is_pod<T>::value> _DequeImpl;
|
||||
|
||||
using _DequeImpl::DequeImpl;
|
||||
using DequeImpl<T, TAlloc, std::is_pod<T>::value>::DequeImpl;
|
||||
using _DequeImpl::operator=;
|
||||
using _DequeImpl::operator==;
|
||||
using _DequeImpl::operator!=;
|
||||
|
|
|
@ -44,7 +44,7 @@ void PolySpline2D::Calculate()
|
|||
for (int i=0; i<n; i++)
|
||||
mCoefs[i] = mat[i];
|
||||
|
||||
delete mat;
|
||||
delete [] mat;
|
||||
}
|
||||
|
||||
float PolySpline2D::Evaluate(float x)
|
||||
|
|
|
@ -834,7 +834,7 @@ public:
|
|||
typename _Base::TStorage mInternalBuffer[TInternalSize - 1];
|
||||
|
||||
public:
|
||||
using _Base::SizedArrayImpl;
|
||||
using SizedArrayImpl<T, TAlloc>::SizedArrayImpl;
|
||||
using _Base::operator=;
|
||||
using _Base::operator==;
|
||||
using _Base::operator!=;
|
||||
|
|
|
@ -723,7 +723,7 @@ bool StringImpl::HasMultibyteChars()
|
|||
{
|
||||
auto ptr = GetPtr();
|
||||
for (int i = 0; i < (int)mLength; i++)
|
||||
if (ptr[i] >= 0x80)
|
||||
if ((uint8)ptr[i] >= (uint8)0x80)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue