FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blending out of local functions

Browse Source 
Some local functions are only needed for OS X compatibility. Define these functions only for OS X versions older than 10.6.
This commit is contained in:
Hartwig
2017-01-01 16:33:37 +01:00
parent 3c482467ea
commit 192dcec5f9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgViewer/DarwinUtils.mm
View File

@@ -366,7 +366,8 @@ void MenubarController::update()
/** Helper method to get a double value out of a CFDictionary */
static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060)
static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
{
double value;
CFNumberRef number_value = (CFNumberRef) CFDictionaryGetValue(refDict, key);
@@ -376,7 +377,7 @@ static double getDictDouble (CFDictionaryRef refDict, CFStringRef key)
return -1; // fail
return value; // otherwise return the long value
}
/** Helper method to get a long value out of a CFDictionary */
static long getDictLong(CFDictionaryRef refDict, CFStringRef key) // const void* key?
{
@@ -388,7 +389,7 @@ static long getDictLong(CFDictionaryRef refDict, CFStringRef key) // cons
return -1; // fail
return value;
}
#endif
/** ctor, get a list of all attached displays */