Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move using directives into the cpp files so they don't leak into apps making use of the locale kit.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30570 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent 2009-05-02 14:52:54 +00:00
parent cbb809dc42
commit 0d487f65e9
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
headers/os/locale/DefaultCatalog.h
View File

@ -30,10 +30,6 @@ struct hash<BPrivate::CatKey> {
#if __GNUC__ > 2 #if __GNUC__ > 2
} // namespace __gnu_cxx } // namespace __gnu_cxx
using __gnu_cxx::hash;
using __gnu_cxx::hash_map;
using __gnu_cxx::equal_to;
#endif // __GNUC__ > 2 #endif // __GNUC__ > 2
namespace BPrivate { namespace BPrivate {
@ -125,7 +121,13 @@ class DefaultCatalog : public BCatalogAddOn {
int32 ComputeFingerprint() const; int32 ComputeFingerprint() const;
void UpdateAttributes(BFile& catalogFile); void UpdateAttributes(BFile& catalogFile);
typedef hash_map<CatKey, BString, hash<CatKey>, equal_to<CatKey> > CatMap; #if __GNUC__ > 2
typedef __gnu_cxx::hash_map<CatKey, BString,
__gnu_cxx::hash<CatKey>, std::equal_to<CatKey> > CatMap;
#else
typedef hash_map<CatKey, BString, hash<CatKey>,
std::equal_to<CatKey> > CatMap;
#endif
CatMap fCatMap; CatMap fCatMap;
mutable BString fPath; mutable BString fPath;

1
src/kits/locale/DefaultCatalog.cpp
View File

@ -24,6 +24,7 @@
#include <cstdio> #include <cstdio>
using __gnu_cxx::hash;
using std::auto_ptr; using std::auto_ptr;
using std::min; using std::min;
using std::max; using std::max;

6
src/kits/locale/GenericNumberFormat.cpp
View File

@ -8,7 +8,11 @@
#include <String.h> #include <String.h>
#include <UnicodeChar.h> #include <UnicodeChar.h>
using namespace std; #if __GNUC__ > 2
using std::max;
using std::min;
using std::nothrow;
#endif
// constants (more below the helper classes) // constants (more below the helper classes)