i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* applied several fixes to make locale kit buildable with gcc4, too

Browse Source 
* actually, all those fixes were already contained in PulkoMandys patch,
  but I just missed that :-/


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30566 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2009-05-02 13:44:35 +00:00
parent 5c3441b4a2
commit 3a268d9080
9 changed files with 199 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/locale/DefaultCatalog.h
+18 -1
View File
@@ -4,16 +4,21 @@
#ifdef __MWERKS__
# include <hashmap.h>
#else
# if __GNUC__ > 2
# include <ext/hash_map>
# else
# include <hash_map>
# endif
#endif
#include <assert.h>
#include <Catalog.h>
#include <DataIO.h>
#include <String.h>
class BFile;
namespace BPrivate {
struct CatKey;
}
@@ -29,10 +34,22 @@ template <class T> struct hash : public unary_function<T,size_t> {
};
#endif
#if __GNUC__ > 2
namespace __gnu_cxx {
#endif // __GNUC__ > 2
template<>
struct hash<BPrivate::CatKey> {
size_t operator() (const BPrivate::CatKey &key) const;
};
#if __GNUC__ > 2
} // namespace __gnu_cxx
using namespace __gnu_cxx;
#endif // __GNUC__ > 2
using namespace std;
namespace BPrivate {
headers/os/locale/GenericNumberFormat.h
+21 -3
View File
@@ -1,5 +1,5 @@
#ifndef _B_GENERIC_NUMBER_FORMAT_H_
#define _B_GENERIC_NUMBER_FORMAT_H_
#ifndef _B_GENERIC_NUMBER_FORMAT_H_
#define _B_GENERIC_NUMBER_FORMAT_H_
#include <FloatFormatParameters.h>
#include <IntegerFormatParameters.h>
@@ -116,6 +116,24 @@ class BGenericNumberFormat {
void Unset() { SetTo(NULL); }
};
static const Symbol kDefaultDigitSymbols[];
static const Symbol kDefaultFractionSeparator;
static const Symbol kDefaultExponentSymbol;
static const Symbol kDefaultUpperCaseExponentSymbol;
static const Symbol kDefaultNaNSymbol;
static const Symbol kDefaultUpperCaseNaNSymbol;
static const Symbol kDefaultInfinitySymbol;
static const Symbol kDefaultUpperCaseInfinitySymbol;
static const Symbol kDefaultNegativeInfinitySymbol;
static const Symbol kDefaultUpperCaseNegativeInfinitySymbol;
static const GroupingInfo kDefaultGroupingInfo;
static const GroupingInfo kNoGroupingInfo;
static const SignSymbols kDefaultSignSymbols;
static const SignSymbols kDefaultMantissaSignSymbols;
static const SignSymbols kDefaultExponentSignSymbols;
status_t FormatInteger(const BIntegerFormatParameters *parameters,
const Integer &integer, char *buffer,
size_t bufferSize,
@@ -157,4 +175,4 @@ class BGenericNumberFormat {
SignSymbols *fExponentSignSymbols;
};
#endif // _B_GENERIC_NUMBER_FORMAT_H_
#endif // _B_GENERIC_NUMBER_FORMAT_H_