Switch to unified view

a/sc2src/conf_post.h b/sc2src/conf_post.h
...
...
30
#undef PACKAGE_NAME
30
#undef PACKAGE_NAME
31
#undef PACKAGE_STRING
31
#undef PACKAGE_STRING
32
#undef PACKAGE_TARNAME
32
#undef PACKAGE_TARNAME
33
#undef PACKAGE_URL
33
#undef PACKAGE_URL
34
#undef PACKAGE_VERSION
34
#undef PACKAGE_VERSION
35
36
#define HAVE_CXX0X_UNORDERED
37
#define HAVE_SHARED_PTR_STD
38
// upmpdcli: requires c++0x but we still need the defs for c++
39
// versions below because of execmd et al.
40
41
#ifdef  HAVE_CXX0X_UNORDERED
42
#  define UNORDERED_MAP_INCLUDE <unordered_map>
43
#  define UNORDERED_SET_INCLUDE <unordered_set>
44
#  define STD_UNORDERED_MAP std::unordered_map
45
#  define STD_UNORDERED_SET std::unordered_set
46
#elif defined(HAVE_TR1_UNORDERED)
47
#  define UNORDERED_MAP_INCLUDE <tr1/unordered_map>
48
#  define UNORDERED_SET_INCLUDE <tr1/unordered_set>
49
#  define STD_UNORDERED_MAP std::tr1::unordered_map
50
#  define STD_UNORDERED_SET std::tr1::unordered_set
51
#else
52
#  define UNORDERED_MAP_INCLUDE <map>
53
#  define UNORDERED_SET_INCLUDE <set>
54
#  define STD_UNORDERED_MAP std::map
55
#  define STD_UNORDERED_SET std::set
56
#endif
57
58
#ifdef HAVE_SHARED_PTR_STD
59
#  define MEMORY_INCLUDE <memory>
60
#  define STD_SHARED_PTR    std::shared_ptr
61
#elif defined(HAVE_SHARED_PTR_TR1)
62
#  define MEMORY_INCLUDE <tr1/memory>
63
#  define STD_SHARED_PTR    std::tr1::shared_ptr
64
#else
65
#  define MEMORY_INCLUDE "refcntr.h"
66
#  define STD_SHARED_PTR    RefCntr
67
#endif