Switch to unified view

a/src/common/conf_post.h b/src/common/conf_post.h
1
#ifdef  HAVE_CXX0X_UNORDERED
2
#  define UNORDERED_MAP_INCLUDE <unordered_map>
1
#define UNORDERED_MAP_INCLUDE <unordered_map>
3
#  define UNORDERED_SET_INCLUDE <unordered_set>
2
#define UNORDERED_SET_INCLUDE <unordered_set>
4
#  define STD_UNORDERED_MAP std::unordered_map
3
#define STD_UNORDERED_MAP std::unordered_map
5
#  define STD_UNORDERED_SET std::unordered_set
4
#define STD_UNORDERED_SET std::unordered_set
6
#elif defined(HAVE_TR1_UNORDERED)
5
#define MEMORY_INCLUDE <memory>
7
#  define UNORDERED_MAP_INCLUDE <tr1/unordered_map>
6
#define STD_SHARED_PTR    std::shared_ptr
8
#  define UNORDERED_SET_INCLUDE <tr1/unordered_set>
9
#  define STD_UNORDERED_MAP std::tr1::unordered_map
10
#  define STD_UNORDERED_SET std::tr1::unordered_set
11
#else
12
#  define UNORDERED_MAP_INCLUDE <map>
13
#  define UNORDERED_SET_INCLUDE <set>
14
#  define STD_UNORDERED_MAP std::map
15
#  define STD_UNORDERED_SET std::set
16
#endif
17
7
18
#ifdef HAVE_SHARED_PTR_STD
19
#  define MEMORY_INCLUDE <memory>
20
#  define STD_SHARED_PTR    std::shared_ptr
21
#elif defined(HAVE_SHARED_PTR_TR1)
22
#  define MEMORY_INCLUDE <tr1/memory>
23
#  define STD_SHARED_PTR    std::tr1::shared_ptr
24
#else
25
#  define MEMORY_INCLUDE "refcntr.h"
26
#  define STD_SHARED_PTR    RefCntr
27
#endif
28
8
29
#ifdef _WIN32
9
#ifdef _WIN32
30
#include "safewindows.h"
10
#include "safewindows.h"
31
11
32
12