FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve function ambiguity for std::abs on mac

Browse Source 
Fixes #126
This commit is contained in:
Jason Watkins
2018-01-18 12:10:20 -08:00
parent 71d4d5aa27
commit e1105206a3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xpcPlugin/XPCPlugin.cpp
View File

@@ -65,6 +65,7 @@
#include "XPLMProcessing.h" #include "XPLMProcessing.h"
// System Includes // System Includes
#include <cstdlib>
#include <cstring> #include <cstring>
#ifdef __APPLE__ #ifdef __APPLE__
#include <mach/mach_time.h> #include <mach/mach_time.h>
@@ -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."); 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 (__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; mach_timebase_info_data_t timeBase;
(void)mach_timebase_info(&timeBase); (void)mach_timebase_info(&timeBase);