From 5f9bc785cb3afb05238d01ac876b3cecbfc96ea8 Mon Sep 17 00:00:00 2001 From: badlogic Date: Mon, 13 Aug 2018 14:09:43 +0200 Subject: [PATCH] [ue4][cpp] UE4 pulls in various system headers on macOS that collide with our types. Fixes #1150. --- spine-cpp/spine-cpp/src/spine/AnimationState.cpp | 2 +- spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp index 6f1637dd0..1f8a40612 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp @@ -44,7 +44,7 @@ using namespace Spine; -void dummyOnAnimationEventFunc(AnimationState *state, EventType type, TrackEntry *entry, Event *event = NULL) { +void dummyOnAnimationEventFunc(AnimationState *state, spine::EventType type, TrackEntry *entry, Event *event = NULL) { SP_UNUSED(state); SP_UNUSED(type); SP_UNUSED(entry); diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp index 4ba7307e6..838b75690 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp @@ -195,7 +195,7 @@ bool SkeletonBounds::intersectsSegment(Polygon *polygon, float x1, float y1, flo return false; } -Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) { +spine::Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) { int index = _boundingBoxes.indexOf(attachment); return index == -1 ? NULL : _polygons[index];