diff options
| author | Frankie Dintino <fdintino@theatlantic.com> | 2016-06-02 14:02:33 -0400 |
|---|---|---|
| committer | Hubert Figuière <hub@figuiere.net> | 2016-06-05 09:21:36 -0400 |
| commit | 71acd8f795d080d7f1ab58a43001b8c0079feb4b (patch) | |
| tree | 401bc12c7da35ec1c23f0d98ed5243c2249a2041 /XMPFiles | |
| parent | b6ff77dd74a12432f434e2bcf5bc8721b403151a (diff) | |
Fix build issues on OS X
Diffstat (limited to 'XMPFiles')
| -rw-r--r-- | XMPFiles/source/PluginHandler/ModuleUtils.h | 1 | ||||
| -rw-r--r-- | XMPFiles/source/PluginHandler/PluginManager.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/XMPFiles/source/PluginHandler/ModuleUtils.h b/XMPFiles/source/PluginHandler/ModuleUtils.h index eedf6bf..e261271 100644 --- a/XMPFiles/source/PluginHandler/ModuleUtils.h +++ b/XMPFiles/source/PluginHandler/ModuleUtils.h @@ -16,7 +16,6 @@ typedef HMODULE OS_ModuleRef; #elif XMP_MacBuild #include <CoreFoundation/CFBundle.h> -#include <tr1/memory> typedef CFBundleRef OS_ModuleRef; #elif XMP_UNIXBuild #include <tr1/memory> diff --git a/XMPFiles/source/PluginHandler/PluginManager.h b/XMPFiles/source/PluginHandler/PluginManager.h index 65165b7..85ec785 100644 --- a/XMPFiles/source/PluginHandler/PluginManager.h +++ b/XMPFiles/source/PluginHandler/PluginManager.h @@ -17,6 +17,9 @@ #include <memory> #include <functional> #define XMP_SHARED_PTR std::shared_ptr +#elif XMP_MacBuild + #include <memory> + #define XMP_SHARED_PTR std::shared_ptr #else #define XMP_SHARED_PTR std::tr1::shared_ptr #endif |