Commits
David B. Evans authored 3ed9b0fe158
1 - | diff -ur ../openbabel-2.3.1-orig/include/openbabel/obmolecformat.h ./include/openbabel/obmolecformat.h |
2 - | --- ../openbabel-2.3.1-orig/include/openbabel/obmolecformat.h 2010-10-10 04:05:12.000000000 +0200 |
3 - | +++ ./include/openbabel/obmolecformat.h 2014-05-29 12:05:22.000000000 +0200 |
4 - | |
5 - | #include <hash_map> |
6 - | #endif |
7 - | |
8 - | -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 1 |
9 - | +#include <ciso646> // detect std::lib |
10 - | +#ifdef _LIBCPP_VERSION |
11 - | + #include <unordered_map> |
12 - | +#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 1 |
13 - | #include <tr1/unordered_map> |
14 - | #elif defined(USE_BOOST) |
15 - | #include <boost/tr1/unordered_map.hpp> |
16 - | diff -ur ../openbabel-2.3.1-orig/include/openbabel/shared_ptr.h ./include/openbabel/shared_ptr.h |
17 - | --- ../openbabel-2.3.1-orig/include/openbabel/shared_ptr.h 2011-10-12 22:24:02.000000000 +0200 |
18 - | +++ ./include/openbabel/shared_ptr.h 2014-05-29 12:00:36.000000000 +0200 |
19 - | |
20 - | #else |
21 - | #include <memory> |
22 - | #if __GNUC__ == 4 //&& __GNUC_MINOR__ < 3 removed at the suggestion of Konstantin Tokarev |
23 - | - #include <tr1/memory> |
24 - | + #ifdef _LIBCPP_VERSION |
25 - | + using std::shared_ptr; |
26 - | + #else |
27 - | + #include <tr1/memory> |
28 - | + using std::tr1::shared_ptr; |
29 - | + #endif |
30 - | #endif |
31 - | - using std::tr1::shared_ptr; |
32 - | #endif |
33 - | |
34 - | #endif // OB_SHARED_PTR_H |