storytold/UE4-OSC
2
0
Fork 0
mirror of https://github.com/storytold/UE4-OSC.git synced 2026-10-17 00:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

compilefix: redefinition of 'RoundUp4' on iOS

Browse Source
This commit is contained in:
monsieurgustav
2017-02-01 20:49:58 +01:00
parent f37bb6e741
commit 511d90f8ac
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSC/Source/OSC/Private/Common/oscpack/osc/OscOutboundPacketStream.cpp
-7
View File
@@ -148,13 +148,6 @@ static void FromUInt64( char *p, uint64 x )
} }
// round up to the next highest multiple of 4. unless x is already a multiple of 4
static inline std::size_t RoundUp4( std::size_t x )
{
return (x + 3) & ~((std::size_t)0x03);
}
OutboundPacketStream::OutboundPacketStream( char *buffer, std::size_t capacity ) OutboundPacketStream::OutboundPacketStream( char *buffer, std::size_t capacity )
: data_( buffer ) : data_( buffer )
, end_( data_ + capacity ) , end_( data_ + capacity )
OSC/Source/OSC/Private/Common/oscpack/osc/OscReceivedElements.cpp
-7
View File
@@ -86,13 +86,6 @@ static inline const char* FindStr4End( const char *p, const char *end )
} }
// round up to the next highest multiple of 4. unless x is already a multiple of 4
static inline uint32 RoundUp4( uint32 x )
{
return (x + 3) & ~((uint32)0x03);
}
static inline int32 ToInt32( const char *p ) static inline int32 ToInt32( const char *p )
{ {
#ifdef OSC_HOST_LITTLE_ENDIAN #ifdef OSC_HOST_LITTLE_ENDIAN
OSC/Source/OSC/Private/Common/oscpack/osc/OscTypes.h
+7
View File
@@ -110,6 +110,13 @@ inline bool IsMultipleOf4( osc_bundle_element_size_t x )
} }
// round up to the next highest multiple of 4. unless x is already a multiple of 4
static inline std::size_t RoundUp4( std::size_t x )
{
return (x + 3) & ~((std::size_t)0x03);
}
enum TypeTagValues { enum TypeTagValues {
TRUE_TYPE_TAG = 'T', TRUE_TYPE_TAG = 'T',
FALSE_TYPE_TAG = 'F', FALSE_TYPE_TAG = 'F',