Fixes that make Haiku build with gcc 4. Mainly out of the following
categories: * Missing includes (like <stdlib.h> and <string.h>). * Linking against $(TARGET_LIBSTDC++) instead of libstdc++.r4.so. * Local variables shadowing parameters. * Default parameters in function definitions (as opposed to function declarations). * All C++ stuff (nothrow, map, set, vector, min, max,...) must be imported explicitly from the std:: namespace now. * "new (sometype)[...]" must read "new sometype[...]", even if sometype is something like "const char *". * __FUNCTION__ is no longer a string literal (but a string expression), i.e. 'printf(__FUNCTION__ ": ...\n")' is invalid code. * A type cast results in a non-lvalue. E.g. "(char *)buffer += bytes" is an invalid expression. * "friend class SomeClass" only works when SomeClass is known before. Otherwise the an inner class with that name is considered as friend. gcc 4 is much pickier about scopes. * gcc 4 is generally stricter with respect to type conversions in C. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14878 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+21
-21
@@ -80,27 +80,27 @@
|
||||
|
||||
/* cpp kit */
|
||||
|
||||
/* -- <typeinfo> */
|
||||
class _IMPEXP_ROOT bad_cast;
|
||||
class _IMPEXP_ROOT bad_typeid;
|
||||
class _IMPEXP_ROOT type_info;
|
||||
|
||||
/* -- <exception> */
|
||||
class _IMPEXP_ROOT exception;
|
||||
class _IMPEXP_ROOT bad_exception;
|
||||
|
||||
/* -- <new.h> */
|
||||
class _IMPEXP_ROOT bad_alloc;
|
||||
|
||||
/* -- <mexcept.h> */
|
||||
class _IMPEXP_ROOT logic_error;
|
||||
class _IMPEXP_ROOT domain_error;
|
||||
class _IMPEXP_ROOT invalid_argument;
|
||||
class _IMPEXP_ROOT length_error;
|
||||
class _IMPEXP_ROOT out_of_range;
|
||||
class _IMPEXP_ROOT runtime_error;
|
||||
class _IMPEXP_ROOT range_error;
|
||||
class _IMPEXP_ROOT overflow_error;
|
||||
// /* -- <typeinfo> */
|
||||
// class _IMPEXP_ROOT bad_cast;
|
||||
// class _IMPEXP_ROOT bad_typeid;
|
||||
// class _IMPEXP_ROOT type_info;
|
||||
//
|
||||
// /* -- <exception> */
|
||||
// class _IMPEXP_ROOT exception;
|
||||
// class _IMPEXP_ROOT bad_exception;
|
||||
//
|
||||
// /* -- <new.h> */
|
||||
// class _IMPEXP_ROOT bad_alloc;
|
||||
//
|
||||
// /* -- <mexcept.h> */
|
||||
// class _IMPEXP_ROOT logic_error;
|
||||
// class _IMPEXP_ROOT domain_error;
|
||||
// class _IMPEXP_ROOT invalid_argument;
|
||||
// class _IMPEXP_ROOT length_error;
|
||||
// class _IMPEXP_ROOT out_of_range;
|
||||
// class _IMPEXP_ROOT runtime_error;
|
||||
// class _IMPEXP_ROOT range_error;
|
||||
// class _IMPEXP_ROOT overflow_error;
|
||||
|
||||
/* support kit */
|
||||
class _IMPEXP_BE BArchivable;
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
#ifndef _MESSAGE_H
|
||||
#define _MESSAGE_H
|
||||
|
||||
#include <BeBuild.h>
|
||||
#include <OS.h>
|
||||
#include <Rect.h>
|
||||
#include <DataIO.h>
|
||||
#include <Flattenable.h>
|
||||
#include <Messenger.h>
|
||||
#include <OS.h>
|
||||
#include <Rect.h>
|
||||
|
||||
// for convenience
|
||||
#include <AppDefs.h>
|
||||
|
||||
@@ -77,12 +77,13 @@ public:
|
||||
size_t inAttributeCount);
|
||||
|
||||
void * operator new(size_t size);
|
||||
void * operator new(size_t size, const nothrow_t &) throw();
|
||||
void * operator new(size_t size,
|
||||
const std::nothrow_t &) throw();
|
||||
void operator delete(void * ptr);
|
||||
#if !__MWERKS__
|
||||
// there's a bug in MWCC under R4.1 and earlier
|
||||
void operator delete(void * ptr,
|
||||
const nothrow_t &) throw();
|
||||
const std::nothrow_t &) throw();
|
||||
#endif
|
||||
|
||||
static status_t SetMemoryPoolSize(size_t in_poolSize);
|
||||
|
||||
@@ -57,6 +57,12 @@ operator==(const pattern& a, const pattern& b)
|
||||
return (*(uint64*)a.data == *(uint64*)b.data);
|
||||
}
|
||||
|
||||
inline bool
|
||||
operator!=(const pattern& a, const pattern& b)
|
||||
{
|
||||
return !(a == b);
|
||||
}
|
||||
|
||||
#endif // __cplusplus
|
||||
|
||||
extern _IMPEXP_BE const pattern B_SOLID_HIGH;
|
||||
|
||||
@@ -15,6 +15,7 @@ class BEntry;
|
||||
struct entry_ref;
|
||||
|
||||
class _rep_data_;
|
||||
class _TContainerViewFilter_;
|
||||
|
||||
class BShelf : public BHandler {
|
||||
public:
|
||||
|
||||
@@ -356,7 +356,7 @@ extern void debugger(const char *message);
|
||||
|
||||
to re-enable the default debugger pass a zero.
|
||||
*/
|
||||
extern const int disable_debugger(int state);
|
||||
extern int disable_debugger(int state);
|
||||
|
||||
// TODO: Remove. Temporary debug helper.
|
||||
extern void debug_printf(const char *format, ...)
|
||||
|
||||
@@ -236,14 +236,14 @@ virtual status_t HandleMessage(
|
||||
size_t size);
|
||||
void * operator new(
|
||||
size_t size,
|
||||
const nothrow_t &) throw();
|
||||
const std::nothrow_t &) throw();
|
||||
void operator delete(
|
||||
void * ptr);
|
||||
#if !__MWERKS__
|
||||
// there's a bug in MWCC under R4.1 and earlier
|
||||
void operator delete(
|
||||
void * ptr,
|
||||
const nothrow_t &) throw();
|
||||
const std::nothrow_t &) throw();
|
||||
#endif
|
||||
|
||||
protected:
|
||||
|
||||
@@ -12,7 +12,9 @@
|
||||
|
||||
|
||||
class BSound;
|
||||
class sound_error : public exception {
|
||||
class _SoundPlayNode;
|
||||
|
||||
class sound_error : public std::exception {
|
||||
const char * m_str_const;
|
||||
public:
|
||||
sound_error(const char * str);
|
||||
|
||||
Reference in New Issue
Block a user