Fix preprocessor for MacOS version.

This commit is contained in:
Phenom 2016-05-06 22:51:25 +02:00
parent 6a7bd9018b
commit ceb092c71f
3 changed files with 12 additions and 6 deletions

View file

@ -33,7 +33,7 @@
#include <stdlib.h>
#include <algorithm>
#include <iostream>
#ifdef __MAC_10_10
#ifdef __MACH__
#include <unordered_set>
#else
#include <tr1/unordered_set>
@ -58,7 +58,7 @@ static const char FILE_CACHE_SEPARATOR_CHAR = '|' ;
****/
static RsMutex FIndexPtrMtx("FIndexPtrMtx") ;
#ifdef __MAC_10_10
#ifdef __MACH__
std::unordered_set<void*> FileIndex::_pointers ;
#else
std::tr1::unordered_set<void*> FileIndex::_pointers ;

View file

@ -27,7 +27,7 @@
#include <string>
#include <map>
#include <set>
#if __MAC_10_10
#if __MACH__
#include <unordered_set>
#else
#include <tr1/unordered_set>
@ -250,7 +250,7 @@ class FileIndex
PersonEntry *root;
#ifdef __MAC_10_10
#ifdef __MACH__
static std::unordered_set<void*> _pointers ;
#else
static std::tr1::unordered_set<void*> _pointers ;