gcc 3 fixes
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4227 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+4
-4
@@ -45,10 +45,10 @@ void *operator new (size_t) __THROW (std::bad_alloc);
|
||||
void *operator new[] (size_t) __THROW (std::bad_alloc);
|
||||
void operator delete (void *) __THROW(__nothing);
|
||||
void operator delete[] (void *) __THROW(__nothing);
|
||||
void *operator new (size_t, const nothrow_t&) __THROW(__nothing);
|
||||
void *operator new[] (size_t, const nothrow_t&) __THROW(__nothing);
|
||||
void operator delete (void *, const nothrow_t&) __THROW(__nothing);
|
||||
void operator delete[] (void *, const nothrow_t&) __THROW(__nothing);
|
||||
void *operator new (size_t, const std::nothrow_t&) __THROW(__nothing);
|
||||
void *operator new[] (size_t, const std::nothrow_t&) __THROW(__nothing);
|
||||
void operator delete (void *, const std::nothrow_t&) __THROW(__nothing);
|
||||
void operator delete[] (void *, const std::nothrow_t&) __THROW(__nothing);
|
||||
|
||||
// default placement versions of operator new
|
||||
#ifndef _BUILDING_NEW_CPP_
|
||||
|
||||
@@ -66,7 +66,6 @@ class BLooperList
|
||||
BLooper* LooperForName(const char* name);
|
||||
BLooper* LooperForPort(port_id port);
|
||||
|
||||
private:
|
||||
struct LooperData
|
||||
{
|
||||
LooperData();
|
||||
@@ -78,6 +77,7 @@ class BLooperList
|
||||
uint32 id;
|
||||
};
|
||||
|
||||
private:
|
||||
static bool EmptySlotPred(LooperData& Data);
|
||||
struct FindLooperPred
|
||||
{
|
||||
|
||||
@@ -93,6 +93,7 @@ public:
|
||||
|
||||
template<class T1>
|
||||
status_t AddData(const char* name, const T1& data, type_code type);
|
||||
status_t AddData(const char* name, type_code type, const void* data, ssize_t numBytes, bool is_fixed_size, int32);
|
||||
status_t FindData(const char* name, type_code type, int32 index,
|
||||
const void** data, ssize_t* numBytes) const;
|
||||
template<class T1>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <SupportDefs.h>
|
||||
|
||||
#include <list>
|
||||
#include <pair.h>
|
||||
#include <utility>
|
||||
|
||||
struct entry_ref;
|
||||
class BMessage;
|
||||
|
||||
@@ -39,11 +39,6 @@ public:
|
||||
status_t DeleteSnifferRule(const char *type);
|
||||
|
||||
void PrintToStream() const;
|
||||
private:
|
||||
status_t BuildRuleList();
|
||||
status_t GuessMimeType(BPositionIO *data, BString *type);
|
||||
ssize_t MaxBytesNeeded();
|
||||
status_t ProcessType(const char *type, ssize_t *bytesNeeded);
|
||||
|
||||
struct sniffer_rule {
|
||||
std::string type; // The mime type that own the rule
|
||||
@@ -53,6 +48,11 @@ private:
|
||||
sniffer_rule(BPrivate::Storage::Sniffer::Rule *rule = NULL);
|
||||
~sniffer_rule();
|
||||
};
|
||||
private:
|
||||
status_t BuildRuleList();
|
||||
status_t GuessMimeType(BPositionIO *data, BString *type);
|
||||
ssize_t MaxBytesNeeded();
|
||||
status_t ProcessType(const char *type, ssize_t *bytesNeeded);
|
||||
|
||||
std::list<sniffer_rule> fRuleList;
|
||||
ssize_t fMaxBytesNeeded;
|
||||
|
||||
Reference in New Issue
Block a user