* removed codewarrior-specific compatibility cruft
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30567 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,14 +1,10 @@
|
|||||||
#ifndef _DEFAULT_CATALOG_H_
|
#ifndef _DEFAULT_CATALOG_H_
|
||||||
#define _DEFAULT_CATALOG_H_
|
#define _DEFAULT_CATALOG_H_
|
||||||
|
|
||||||
#ifdef __MWERKS__
|
#if __GNUC__ > 2
|
||||||
# include <hashmap.h>
|
|
||||||
#else
|
|
||||||
# if __GNUC__ > 2
|
|
||||||
# include <ext/hash_map>
|
# include <ext/hash_map>
|
||||||
# else
|
#else
|
||||||
# include <hash_map>
|
# include <hash_map>
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
@@ -23,17 +19,6 @@ namespace BPrivate {
|
|||||||
struct CatKey;
|
struct CatKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* the hash-access functor which is being used to access the hash-value
|
|
||||||
* stored inside of each key.
|
|
||||||
*/
|
|
||||||
#ifdef __MWERKS__
|
|
||||||
// Codewarrior doesn't provide this declaration, so we do:
|
|
||||||
template <class T> struct hash : public unary_function<T,size_t> {
|
|
||||||
size_t operator() (const T &key) const;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if __GNUC__ > 2
|
#if __GNUC__ > 2
|
||||||
namespace __gnu_cxx {
|
namespace __gnu_cxx {
|
||||||
#endif // __GNUC__ > 2
|
#endif // __GNUC__ > 2
|
||||||
|
|||||||
Reference in New Issue
Block a user