From e1105206a36b33e9f151cc1d45e881228a158824 Mon Sep 17 00:00:00 2001 From: Jason Watkins Date: Thu, 18 Jan 2018 12:10:20 -0800 Subject: [PATCH] Resolve function ambiguity for std::abs on mac Fixes #126 --- xpcPlugin/XPCPlugin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xpcPlugin/XPCPlugin.cpp b/xpcPlugin/XPCPlugin.cpp index e02f1d2..05420cc 100755 --- a/xpcPlugin/XPCPlugin.cpp +++ b/xpcPlugin/XPCPlugin.cpp @@ -65,6 +65,7 @@ #include "XPLMProcessing.h" // System Includes +#include #include #ifdef __APPLE__ #include @@ -94,7 +95,8 @@ PLUGIN_API int XPluginStart(char* outName, char* outSig, char* outDesc) strcpy(outDesc, "X Plane Communications Toolbox\nCopyright (c) 2013-2017 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved."); #if (__APPLE__) - if ( abs(timeConvert) <= 1e-9 ) // is about 0 + int (*_abs)( int ) = & std::abs; // Needed to resolve ambiguity for OS X compilation + if ( _abs(timeConvert) <= 1e-9 ) // is about 0 { mach_timebase_info_data_t timeBase; (void)mach_timebase_info(&timeBase);