From 758b1d0e05fe1042cce6e00d194a147802d4f9be Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 12 Nov 2005 23:27:14 +0000 Subject: [PATCH] Fixes that make Haiku build with gcc 4. Mainly out of the following categories: * Missing includes (like and ). * 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 --- headers/os/BeBuild.h | 42 +++++++------- headers/os/app/Message.h | 6 +- headers/os/game/GameSound.h | 5 +- headers/os/interface/GraphicsDefs.h | 6 ++ headers/os/interface/Shelf.h | 1 + headers/os/kernel/OS.h | 2 +- headers/os/media/MediaNode.h | 4 +- headers/os/media/SoundPlayer.h | 4 +- headers/posix/signal.h | 2 +- headers/private/app/MessageBody.h | 3 + headers/private/app/MessageField.h | 3 + headers/private/graphics/common/debug_ext.h | 14 ++--- headers/private/graphics/nvidia/nv_macros.h | 2 +- .../disk_device_manager/KDiskDeviceUtils.h | 6 ++ .../private/kernel/util/DoublyLinkedList.h | 2 +- headers/private/kernel/util/KMessage.h | 4 +- headers/private/kernel/util/VectorMap.h | 7 ++- headers/private/media/DataExchange.h | 2 + headers/private/net/net_stack_driver.h | 2 +- headers/private/shared/cpu_type.h | 2 + src/add-ons/accelerants/radeon/impactv.c | 2 + src/add-ons/accelerants/radeon/theatre_out.c | 1 + src/add-ons/accelerants/vesa/hooks.cpp | 58 +++++++++---------- src/add-ons/accelerants/vesa/mode.cpp | 1 + .../config_manager/config_manager.c | 2 +- .../kernel/bus_managers/ide/emulation.c | 2 +- src/add-ons/kernel/bus_managers/ide/wrapper.h | 14 ++--- .../kernel/bus_managers/scsi/emulation.c | 4 +- .../kernel/bus_managers/scsi/wrapper.h | 14 ++--- .../kernel/busses/ide/ide_isa/wrapper.h | 14 ++--- .../kernel/drivers/audio/ac97/ich/ich.h | 2 +- .../drivers/disk/scsi/scsi_cd/wrapper.h | 14 ++--- .../drivers/disk/scsi/scsi_dsk/wrapper.h | 14 ++--- .../kernel/drivers/network/via-rhine/pci.c | 1 + src/add-ons/kernel/file_systems/bfs/Chain.h | 1 + src/add-ons/kernel/file_systems/bfs/Inode.cpp | 15 ++++- .../kernel/generic/block_io/block_io.c | 2 +- src/add-ons/kernel/generic/block_io/wrapper.h | 14 ++--- .../kernel/generic/ide_adapter/wrapper.h | 14 ++--- .../kernel/generic/scsi_periph/wrapper.h | 14 ++--- .../network/interfaces/ppp/PPPManager.cpp | 14 ++--- .../kernel/network/ppp/ipcp/Protocol.cpp | 4 +- .../kernel/network/ppp/modem/ModemDevice.cpp | 4 +- .../network/ppp/pppoe/DiscoveryPacket.cpp | 8 +-- .../kernel/network/ppp/pppoe/PPPoEDevice.cpp | 4 +- .../libkernelppp/KPPPConfigurePacket.cpp | 4 +- .../ppp/shared/libkernelppp/KPPPInterface.cpp | 8 +-- .../ppp/shared/libkernelppp/KPPPLCP.cpp | 6 +- .../ppp/shared/libkernelppp/KPPPProtocol.cpp | 6 +- .../shared/libkernelppp/KPPPReportManager.cpp | 2 +- .../shared/libkernelppp/KPPPStateMachine.cpp | 4 +- .../shared/libkernelppp/headers/KPPPManager.h | 10 ++-- .../libkernelppp/headers/KPPPStateMachine.h | 4 ++ .../libkernelppp/headers/TemplateList.h | 14 ++--- .../libppp/MessageDriverSettingsUtils.cpp | 2 +- .../ppp/shared/libppp/PPPInterface.cpp | 4 +- .../network/ppp/shared/libppp/PPPManager.cpp | 9 ++- .../media-add-ons/mixer/MixerSettings.cpp | 2 + .../multi_audio/MultiAudioAddOn.cpp | 2 +- .../multi_audio/MultiAudioNode.cpp | 16 ++--- .../mov_reader/libMOV/MOVFileReader.cpp | 2 +- .../plugins/mp3_reader/MP3ReaderPlugin.cpp | 1 + .../plugins/musepack/MusePackDecoder.cpp | 1 + .../media/plugins/musepack/mpc/in_mpc.cpp | 1 + .../media/plugins/ogg/OggReaderPlugin.h | 1 + .../plugins/vorbis/vorbisCodecPlugin.cpp | 2 +- src/add-ons/translators/gif/SavePalette.cpp | 2 + .../translators/jpeg/JPEGTranslator.cpp | 20 +++---- .../translators/shared/BaseTranslator.cpp | 2 +- src/apps/abouthaiku/AboutHaiku.cpp | 4 +- src/apps/diskprobe/AttributeWindow.cpp | 4 +- src/apps/diskprobe/DataEditor.cpp | 2 +- src/apps/diskprobe/FileWindow.cpp | 6 +- src/apps/diskprobe/FindWindow.cpp | 4 +- src/apps/expander/ExpanderSettings.cpp | 1 + src/apps/pulse/ConfigView.cpp | 1 + src/apps/showimage/ShowImageView.cpp | 2 + src/apps/showimage/ShowImageWindow.cpp | 2 +- src/apps/soundrecorder/TrackSlider.cpp | 1 + src/apps/soundrecorder/TransportButton.cpp | 2 + src/apps/soundrecorder/UpDownButton.cpp | 4 +- src/apps/stylededit/StyledEditApp.cpp | 2 +- src/bin/addattr/main.cpp | 1 + src/bin/df.cpp | 1 + src/bin/dstcheck.cpp | 7 ++- src/bin/mkindex.cpp | 1 + src/bin/mountvolume.cpp | 3 + src/bin/ppp_up/ConnectionView.cpp | 3 +- src/bin/ppp_up/PPPDeskbarReplicant.cpp | 2 +- src/bin/roster.cpp | 1 + src/bin/strace/Jamfile | 2 +- src/bin/strace/MemoryReader.cpp | 1 + src/bin/strace/Syscall.h | 3 + src/bin/strace/TypeHandler.cpp | 18 +++--- src/bin/strace/TypeHandler.h | 2 + src/bin/strace/strace.cpp | 4 ++ src/kits/debug/SymbolLookup.cpp | 1 + src/kits/debug/debug_support.cpp | 2 + src/kits/game/GameSound.cpp | 7 ++- src/kits/game/PushGameSound.cpp | 1 + src/kits/interface/Font.cpp | 1 + src/kits/interface/Menu.cpp | 1 + src/kits/interface/Shape.cpp | 2 +- src/kits/interface/Shelf.cpp | 1 + src/kits/media/ChunkCache.cpp | 2 + src/kits/media/MediaNode.cpp | 3 + src/kits/media/Sound.cpp | 4 +- src/kits/media/SoundPlayNode.cpp | 14 ++--- src/kits/media/TimeCode.cpp | 8 +-- src/kits/media/TimeSourceObject.cpp | 1 + src/kits/media/TimedEventQueuePrivate.cpp | 2 + src/kits/network/libnetapi/NetEndpoint.cpp | 2 +- src/kits/storage/Partition.cpp | 2 + src/kits/storage/ResourceFile.cpp | 4 +- src/kits/storage/storage_support.cpp | 2 +- src/kits/support/Beep.cpp | 2 +- src/kits/support/PointerList.cpp | 5 +- src/kits/textencoding/character_sets.cpp | 2 +- src/kits/textencoding/utf8_conversions.cpp | 4 +- src/preferences/backgrounds/BGView.cpp | 2 +- .../datatranslations/DataTranslationsView.cpp | 2 +- src/preferences/filetypes/FileTypesApp.cpp | 2 +- src/preferences/fonts/FontSelectionView.cpp | 4 +- src/preferences/fonts/FontView.cpp | 4 +- src/preferences/keymap/KeymapTextView.cpp | 2 +- src/preferences/media/MediaAlert.cpp | 4 +- src/preferences/media/MediaListItem.cpp | 6 +- src/preferences/menu/MenuWindow.cpp | 5 +- src/preferences/mouse/MouseWindow.cpp | 4 +- src/preferences/screensaver/Jamfile | 2 +- .../screensaver/ScreenSaverWindow.cpp | 2 +- src/preferences/time/CalendarView.cpp | 2 +- src/preferences/time/DateTimeEdit.cpp | 2 +- src/preferences/virtualmemory/Jamfile | 2 +- src/preferences/virtualmemory/Settings.cpp | 1 + src/servers/app/BitmapManager.cpp | 1 + src/servers/app/FontManager.cpp | 1 + src/servers/app/HashTable.cpp | 1 + src/servers/app/MessageLooper.cpp | 1 + src/servers/app/RAMLinkMsgReader.cpp | 3 +- src/servers/app/ScreenManager.cpp | 2 + src/servers/app/ServerBitmap.cpp | 4 ++ src/servers/app/ServerWindow.cpp | 2 + src/servers/app/SystemPalette.cpp | 1 + src/servers/app/VirtualScreen.cpp | 2 + .../app/drawing/AccelerantHWInterface.cpp | 4 +- src/servers/app/drawing/BitmapHWInterface.cpp | 4 +- src/servers/debug/DebugServer.cpp | 2 + src/servers/media/MMediaFilesManager.cpp | 4 +- src/servers/registrar/AppInfoList.cpp | 2 +- src/servers/registrar/ClipboardHandler.cpp | 2 + src/servers/registrar/MessageDeliverer.cpp | 4 ++ .../registrar/MessageRunnerManager.cpp | 3 + src/servers/registrar/MessagingService.cpp | 3 + src/servers/registrar/Registrar.cpp | 1 + src/servers/registrar/RosterAppInfo.cpp | 2 + src/servers/registrar/ShutdownProcess.cpp | 1 + src/servers/registrar/ShutdownProcess.h | 5 ++ src/servers/registrar/TRoster.cpp | 1 + src/servers/registrar/TRoster.h | 6 ++ src/system/boot/platform/bios_ia32/smp.cpp | 2 +- .../kernel/arch/x86/arch_vm_translation_map.c | 4 +- src/system/kernel/timer.c | 10 ++-- src/system/kernel/util/kernel_cpp.cpp | 28 +++++++++ src/system/libroot/os/debug.c | 2 +- src/tests/apps/miniterminal/Arguments.cpp | 2 + src/tools/gensyscalls/Jamfile | 7 ++- 167 files changed, 497 insertions(+), 304 deletions(-) diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h index 8993e408a4..6eaec94020 100644 --- a/headers/os/BeBuild.h +++ b/headers/os/BeBuild.h @@ -80,27 +80,27 @@ /* cpp kit */ -/* -- */ -class _IMPEXP_ROOT bad_cast; -class _IMPEXP_ROOT bad_typeid; -class _IMPEXP_ROOT type_info; - -/* -- */ -class _IMPEXP_ROOT exception; -class _IMPEXP_ROOT bad_exception; - -/* -- */ -class _IMPEXP_ROOT bad_alloc; - -/* -- */ -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; +// /* -- */ +// class _IMPEXP_ROOT bad_cast; +// class _IMPEXP_ROOT bad_typeid; +// class _IMPEXP_ROOT type_info; +// +// /* -- */ +// class _IMPEXP_ROOT exception; +// class _IMPEXP_ROOT bad_exception; +// +// /* -- */ +// class _IMPEXP_ROOT bad_alloc; +// +// /* -- */ +// 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; diff --git a/headers/os/app/Message.h b/headers/os/app/Message.h index 1259013076..8aa8d5a50a 100644 --- a/headers/os/app/Message.h +++ b/headers/os/app/Message.h @@ -9,11 +9,11 @@ #ifndef _MESSAGE_H #define _MESSAGE_H -#include -#include -#include #include #include +#include +#include +#include // for convenience #include diff --git a/headers/os/game/GameSound.h b/headers/os/game/GameSound.h index 5add552493..a36233e0b5 100644 --- a/headers/os/game/GameSound.h +++ b/headers/os/game/GameSound.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); diff --git a/headers/os/interface/GraphicsDefs.h b/headers/os/interface/GraphicsDefs.h index b3c9a727df..012cf6a864 100644 --- a/headers/os/interface/GraphicsDefs.h +++ b/headers/os/interface/GraphicsDefs.h @@ -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; diff --git a/headers/os/interface/Shelf.h b/headers/os/interface/Shelf.h index 7afbd91622..b19a138c92 100644 --- a/headers/os/interface/Shelf.h +++ b/headers/os/interface/Shelf.h @@ -15,6 +15,7 @@ class BEntry; struct entry_ref; class _rep_data_; +class _TContainerViewFilter_; class BShelf : public BHandler { public: diff --git a/headers/os/kernel/OS.h b/headers/os/kernel/OS.h index b81b0c0330..51bf5f5a4e 100644 --- a/headers/os/kernel/OS.h +++ b/headers/os/kernel/OS.h @@ -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, ...) diff --git a/headers/os/media/MediaNode.h b/headers/os/media/MediaNode.h index 657a796d9b..bbd812627e 100644 --- a/headers/os/media/MediaNode.h +++ b/headers/os/media/MediaNode.h @@ -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: diff --git a/headers/os/media/SoundPlayer.h b/headers/os/media/SoundPlayer.h index 087bc68d45..068975d0f2 100644 --- a/headers/os/media/SoundPlayer.h +++ b/headers/os/media/SoundPlayer.h @@ -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); diff --git a/headers/posix/signal.h b/headers/posix/signal.h index bf9d794ff7..affc6370fc 100644 --- a/headers/posix/signal.h +++ b/headers/posix/signal.h @@ -156,7 +156,7 @@ int sigismember(const sigset_t *set, int signo); const char *strsignal(int sig); -const void set_signal_stack(void *ptr, size_t size); +void set_signal_stack(void *ptr, size_t size); int sigaltstack(const stack_t *ss, stack_t *oss); /* XXXdbg */ extern inline int diff --git a/headers/private/app/MessageBody.h b/headers/private/app/MessageBody.h index 40b5f137c7..fe8290550c 100644 --- a/headers/private/app/MessageBody.h +++ b/headers/private/app/MessageBody.h @@ -30,6 +30,7 @@ #include // Standard Includes ----------------------------------------------------------- #include +#include #include #include @@ -52,6 +53,8 @@ enum { B_FLATTENABLE_TYPE = 'FLAT' }; +using namespace std; + namespace BPrivate { class BMessageBody diff --git a/headers/private/app/MessageField.h b/headers/private/app/MessageField.h index 9b20d8677c..6e958f457f 100644 --- a/headers/private/app/MessageField.h +++ b/headers/private/app/MessageField.h @@ -29,6 +29,7 @@ #define MESSAGEFIELD_H // Standard Includes ----------------------------------------------------------- +#include #include #include #include @@ -58,6 +59,8 @@ #define MSG_LAST_ENTRY 0x0 +using namespace std; + // Globals --------------------------------------------------------------------- namespace BPrivate { diff --git a/headers/private/graphics/common/debug_ext.h b/headers/private/graphics/common/debug_ext.h index 2c7bb12766..c15ce313fc 100644 --- a/headers/private/graphics/common/debug_ext.h +++ b/headers/private/graphics/common/debug_ext.h @@ -73,36 +73,36 @@ #error you need to define DEBUG_MSG_PREFIX with the module name #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif diff --git a/headers/private/graphics/nvidia/nv_macros.h b/headers/private/graphics/nvidia/nv_macros.h index a8374694b1..f7e368b7e7 100644 --- a/headers/private/graphics/nvidia/nv_macros.h +++ b/headers/private/graphics/nvidia/nv_macros.h @@ -784,7 +784,7 @@ #define NV_REG32(r_) ((vuint32 *)regs)[(r_) >> 2] /* read and write to PCI config space */ -#define CFGR(A) (nv_pci_access.offset=NVCFG_##A, ioctl(fd,NV_GET_PCI, &nv_pci_access,sizeof(nv_pci_access)), nv_pci_access.value) +#define CFGR(A) (*(nv_pci_access.offset=NVCFG_##A, ioctl(fd,NV_GET_PCI, &nv_pci_access,sizeof(nv_pci_access)), &nv_pci_access.value)) #define CFGW(A,B) (nv_pci_access.offset=NVCFG_##A, nv_pci_access.value = B, ioctl(fd,NV_SET_PCI,&nv_pci_access,sizeof(nv_pci_access))) /* read and write from ISA I/O space */ diff --git a/headers/private/kernel/disk_device_manager/KDiskDeviceUtils.h b/headers/private/kernel/disk_device_manager/KDiskDeviceUtils.h index c1af0ea9b3..cf0b5e8d75 100644 --- a/headers/private/kernel/disk_device_manager/KDiskDeviceUtils.h +++ b/headers/private/kernel/disk_device_manager/KDiskDeviceUtils.h @@ -10,6 +10,12 @@ #include +// instantiations +#include +#include +#include +#include + namespace BPrivate { namespace DiskDevice { diff --git a/headers/private/kernel/util/DoublyLinkedList.h b/headers/private/kernel/util/DoublyLinkedList.h index 2422669bf4..e82079d26b 100644 --- a/headers/private/kernel/util/DoublyLinkedList.h +++ b/headers/private/kernel/util/DoublyLinkedList.h @@ -93,7 +93,7 @@ class List { } private: - friend class IteratorType; + friend class DoublyLinked::Iterator; Link fLink; }; diff --git a/headers/private/kernel/util/KMessage.h b/headers/private/kernel/util/KMessage.h index e0eea988d7..7c811e8a4c 100644 --- a/headers/private/kernel/util/KMessage.h +++ b/headers/private/kernel/util/KMessage.h @@ -11,6 +11,8 @@ #include #include +class BMessage; + namespace BPrivate { class KMessageField; @@ -100,7 +102,7 @@ public: private: friend class KMessageField; - friend class BMessage; // not so nice, but makes things easier + friend class ::BMessage; // not so nice, but makes things easier struct Header { uint32 magic; diff --git a/headers/private/kernel/util/VectorMap.h b/headers/private/kernel/util/VectorMap.h index 2a7cd01e06..0c5cf00184 100644 --- a/headers/private/kernel/util/VectorMap.h +++ b/headers/private/kernel/util/VectorMap.h @@ -127,8 +127,11 @@ private: int32 _FindInsertionIndex(const Key &key, bool &exists) const; private: - friend class Entry; - friend class ConstEntry; +// friend class Entry; +// friend class ConstEntry; + friend class VectorMapEntry; + friend class VectorMapEntry; ElementVector fElements; EntryStrategy fEntryStrategy; diff --git a/headers/private/media/DataExchange.h b/headers/private/media/DataExchange.h index cf6438f91d..3e76a148ae 100644 --- a/headers/private/media/DataExchange.h +++ b/headers/private/media/DataExchange.h @@ -6,6 +6,8 @@ #ifndef _DATA_EXCHANGE_H #define _DATA_EXCHANGE_H +#include + #include #include #include diff --git a/headers/private/net/net_stack_driver.h b/headers/private/net/net_stack_driver.h index f218dcc8e9..0ff04295ff 100644 --- a/headers/private/net/net_stack_driver.h +++ b/headers/private/net/net_stack_driver.h @@ -12,7 +12,7 @@ struct sockaddr; #define NET_STACK_DRIVER_DEV "net/stack" -#define NET_STACK_DRIVER_PATH "/dev/" ## NET_STACK_DRIVER_DEV +#define NET_STACK_DRIVER_PATH "/dev/" NET_STACK_DRIVER_DEV enum { // Paranoia mode: be far away of B_DEVICE_OP_CODES_END opcodes!!! diff --git a/headers/private/shared/cpu_type.h b/headers/private/shared/cpu_type.h index d154ad95fc..0b7071fad3 100644 --- a/headers/private/shared/cpu_type.h +++ b/headers/private/shared/cpu_type.h @@ -7,6 +7,8 @@ * It's used by Pulse, AboutHaiku, and sysinfo. */ +#include + #include #ifdef __cplusplus diff --git a/src/add-ons/accelerants/radeon/impactv.c b/src/add-ons/accelerants/radeon/impactv.c index 960c504711..890c7b325a 100644 --- a/src/add-ons/accelerants/radeon/impactv.c +++ b/src/add-ons/accelerants/radeon/impactv.c @@ -561,6 +561,7 @@ void Radeon_CalcImpacTVRegisters( values->tv_dac_cntl |= RADEON_TV_DAC_CNTL_STD_PAL; break; default: + ; } // enable composite or S-Video DAC @@ -630,6 +631,7 @@ void Radeon_CalcImpacTVRegisters( default: // there are many formats missing, sigh... + ; } // RE: diff --git a/src/add-ons/accelerants/radeon/theatre_out.c b/src/add-ons/accelerants/radeon/theatre_out.c index 77f23c1672..7907e55fa7 100644 --- a/src/add-ons/accelerants/radeon/theatre_out.c +++ b/src/add-ons/accelerants/radeon/theatre_out.c @@ -266,5 +266,6 @@ void Radeon_DetectTVOut( break; } default: // for internal encoder, we don't have to look farther - it must be there + ; } } diff --git a/src/add-ons/accelerants/vesa/hooks.cpp b/src/add-ons/accelerants/vesa/hooks.cpp index 4fb42cd00c..1235add5d8 100644 --- a/src/add-ons/accelerants/vesa/hooks.cpp +++ b/src/add-ons/accelerants/vesa/hooks.cpp @@ -34,71 +34,71 @@ get_accelerant_hook(uint32 feature, void *data) switch (feature) { /* general */ case B_INIT_ACCELERANT: - return vesa_init_accelerant; + return (void*)vesa_init_accelerant; case B_UNINIT_ACCELERANT: - return vesa_uninit_accelerant; + return (void*)vesa_uninit_accelerant; case B_CLONE_ACCELERANT: - return vesa_clone_accelerant; + return (void*)vesa_clone_accelerant; case B_ACCELERANT_CLONE_INFO_SIZE: - return vesa_accelerant_clone_info_size; + return (void*)vesa_accelerant_clone_info_size; case B_GET_ACCELERANT_CLONE_INFO: - return vesa_get_accelerant_clone_info; + return (void*)vesa_get_accelerant_clone_info; case B_GET_ACCELERANT_DEVICE_INFO: - return vesa_get_accelerant_device_info; + return (void*)vesa_get_accelerant_device_info; case B_ACCELERANT_RETRACE_SEMAPHORE: - return vesa_accelerant_retrace_semaphore; + return (void*)vesa_accelerant_retrace_semaphore; /* mode configuration */ case B_ACCELERANT_MODE_COUNT: - return vesa_accelerant_mode_count; + return (void*)vesa_accelerant_mode_count; case B_GET_MODE_LIST: - return vesa_get_mode_list; + return (void*)vesa_get_mode_list; case B_PROPOSE_DISPLAY_MODE: - return vesa_propose_display_mode; + return (void*)vesa_propose_display_mode; case B_SET_DISPLAY_MODE: - return vesa_set_display_mode; + return (void*)vesa_set_display_mode; case B_GET_DISPLAY_MODE: - return vesa_get_display_mode; + return (void*)vesa_get_display_mode; case B_GET_FRAME_BUFFER_CONFIG: - return vesa_get_frame_buffer_config; + return (void*)vesa_get_frame_buffer_config; case B_GET_PIXEL_CLOCK_LIMITS: - return vesa_get_pixel_clock_limits; + return (void*)vesa_get_pixel_clock_limits; case B_MOVE_DISPLAY: - return vesa_move_display; + return (void*)vesa_move_display; case B_SET_INDEXED_COLORS: - return vesa_set_indexed_colors; + return (void*)vesa_set_indexed_colors; case B_GET_TIMING_CONSTRAINTS: - return vesa_get_timing_constraints; + return (void*)vesa_get_timing_constraints; /* DPMS */ case B_DPMS_CAPABILITIES: - return vesa_dpms_capabilities; + return (void*)vesa_dpms_capabilities; case B_DPMS_MODE: - return vesa_dpms_mode; + return (void*)vesa_dpms_mode; case B_SET_DPMS_MODE: - return vesa_set_dpms_mode; + return (void*)vesa_set_dpms_mode; /* cursor managment */ case B_SET_CURSOR_SHAPE: - return vesa_set_cursor_shape; + return (void*)vesa_set_cursor_shape; case B_MOVE_CURSOR: - return vesa_move_cursor; + return (void*)vesa_move_cursor; case B_SHOW_CURSOR: - return vesa_show_cursor; + return (void*)vesa_show_cursor; /* engine/synchronization */ case B_ACCELERANT_ENGINE_COUNT: - return vesa_accelerant_engine_count; + return (void*)vesa_accelerant_engine_count; case B_ACQUIRE_ENGINE: - return vesa_acquire_engine; + return (void*)vesa_acquire_engine; case B_RELEASE_ENGINE: - return vesa_release_engine; + return (void*)vesa_release_engine; case B_WAIT_ENGINE_IDLE: - return vesa_wait_engine_idle; + return (void*)vesa_wait_engine_idle; case B_GET_SYNC_TOKEN: - return vesa_get_sync_token; + return (void*)vesa_get_sync_token; case B_SYNC_TO_TOKEN: - return vesa_sync_to_token; + return (void*)vesa_sync_to_token; } return NULL; diff --git a/src/add-ons/accelerants/vesa/mode.cpp b/src/add-ons/accelerants/vesa/mode.cpp index 2537cbb0da..9a2a1e81a6 100644 --- a/src/add-ons/accelerants/vesa/mode.cpp +++ b/src/add-ons/accelerants/vesa/mode.cpp @@ -3,6 +3,7 @@ * Distributed under the terms of the MIT License. */ +#include #include "accelerant_protos.h" #include "accelerant.h" diff --git a/src/add-ons/kernel/bus_managers/config_manager/config_manager.c b/src/add-ons/kernel/bus_managers/config_manager/config_manager.c index 278a376892..cf75e86713 100644 --- a/src/add-ons/kernel/bus_managers/config_manager/config_manager.c +++ b/src/add-ons/kernel/bus_managers/config_manager/config_manager.c @@ -19,7 +19,7 @@ static pci_module_info *gPCI = NULL; #define B_CONFIG_MANAGER_FOR_BUS_MODULE_NAME "bus_managers/config_manager/bus/v1" -#define FUNCTION(x...) dprintf(__FUNCTION__ x) +#define FUNCTION(x, y...) dprintf("%s" x, __FUNCTION__, y) #define TRACE(x) dprintf x diff --git a/src/add-ons/kernel/bus_managers/ide/emulation.c b/src/add-ons/kernel/bus_managers/ide/emulation.c index 222a4100b2..9d22648455 100644 --- a/src/add-ons/kernel/bus_managers/ide/emulation.c +++ b/src/add-ons/kernel/bus_managers/ide/emulation.c @@ -108,7 +108,7 @@ copy_sg_data(scsi_ccb *request, uint offset, uint allocation_length, unmap_mainmemory(virt_addr); - (char *)buffer += bytes; + buffer = (char *)buffer + bytes; size -= bytes; offset = 0; } diff --git a/src/add-ons/kernel/bus_managers/ide/wrapper.h b/src/add-ons/kernel/bus_managers/ide/wrapper.h index 137dbfc84a..2a5e7f42d0 100644 --- a/src/add-ons/kernel/bus_managers/ide/wrapper.h +++ b/src/add-ons/kernel/bus_managers/ide/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 4 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/bus_managers/scsi/emulation.c b/src/add-ons/kernel/bus_managers/scsi/emulation.c index d6c82a3531..a8952e4129 100644 --- a/src/add-ons/kernel/bus_managers/scsi/emulation.c +++ b/src/add-ons/kernel/bus_managers/scsi/emulation.c @@ -271,8 +271,6 @@ scsi_start_emulation(scsi_ccb *request) case SCSI_OP_MODE_SELECT_6: return scsi_start_mode_select_6(request); - - default: } return true; @@ -506,7 +504,7 @@ copy_sg_data(scsi_ccb *request, uint offset, uint allocation_length, unmap_mainmemory((void *)virt_addr); - (char *)buffer += bytes; + buffer = (char *)buffer + bytes; size -= bytes; offset = 0; } diff --git a/src/add-ons/kernel/bus_managers/scsi/wrapper.h b/src/add-ons/kernel/bus_managers/scsi/wrapper.h index 6793cb73be..3248124820 100644 --- a/src/add-ons/kernel/bus_managers/scsi/wrapper.h +++ b/src/add-ons/kernel/bus_managers/scsi/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 1 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/busses/ide/ide_isa/wrapper.h b/src/add-ons/kernel/busses/ide/ide_isa/wrapper.h index 57f5c881e2..c2154db825 100644 --- a/src/add-ons/kernel/busses/ide/ide_isa/wrapper.h +++ b/src/add-ons/kernel/busses/ide/ide_isa/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 3 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/drivers/audio/ac97/ich/ich.h b/src/add-ons/kernel/drivers/audio/ac97/ich/ich.h index be14658e05..0b0b61251e 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/ich/ich.h +++ b/src/add-ons/kernel/drivers/audio/ac97/ich/ich.h @@ -39,7 +39,7 @@ #define VERSION_DEBUG "" #endif -#define VERSION "Version " VERSION_NUMBER VERSION_DEBUG ", Copyright (c) 2002-2005 Marcus Overhagen, compiled on " ## __DATE__ ## " " ## __TIME__ +#define VERSION "Version " VERSION_NUMBER VERSION_DEBUG ", Copyright (c) 2002-2005 Marcus Overhagen, compiled on " __DATE__ " " __TIME__ #define DRIVER_NAME "ich_ac97" #define BUFFER_SIZE 2048 diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/wrapper.h b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/wrapper.h index 6793cb73be..3248124820 100644 --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/wrapper.h +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 1 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_dsk/wrapper.h b/src/add-ons/kernel/drivers/disk/scsi/scsi_dsk/wrapper.h index 57f5c881e2..c2154db825 100644 --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_dsk/wrapper.h +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_dsk/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 3 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/drivers/network/via-rhine/pci.c b/src/add-ons/kernel/drivers/network/via-rhine/pci.c index c0a40883da..172fc054a3 100644 --- a/src/add-ons/kernel/drivers/network/via-rhine/pci.c +++ b/src/add-ons/kernel/drivers/network/via-rhine/pci.c @@ -124,6 +124,7 @@ int32 pci_getlist(pci_info *info[], int32 maxEntries) j++; } next_entry: + ; // gcc 4 doesn't like labels at the end of a compound statement } info[entries] = NULL; diff --git a/src/add-ons/kernel/file_systems/bfs/Chain.h b/src/add-ons/kernel/file_systems/bfs/Chain.h index 7d7e3e87ef..4945245910 100644 --- a/src/add-ons/kernel/file_systems/bfs/Chain.h +++ b/src/add-ons/kernel/file_systems/bfs/Chain.h @@ -7,6 +7,7 @@ ** This file may be used under the terms of the OpenBeOS License. */ +#include /** The Link class you want to use with the Chain class needs to have * a "fNext" member which is accessable from within the Chain class. diff --git a/src/add-ons/kernel/file_systems/bfs/Inode.cpp b/src/add-ons/kernel/file_systems/bfs/Inode.cpp index 65191b23bc..2c15ca2eed 100644 --- a/src/add-ons/kernel/file_systems/bfs/Inode.cpp +++ b/src/add-ons/kernel/file_systems/bfs/Inode.cpp @@ -1764,8 +1764,11 @@ Inode::ShrinkStream(Transaction &transaction, off_t size) status_t status; if (data->MaxDoubleIndirectRange() > size) { + off_t *maxDoubleIndirect = &data->max_double_indirect_range; + // gcc 4 work-around: "error: cannot bind packed field + // 'data->data_stream::max_double_indirect_range' to 'off_t&'" status = FreeStaticStreamArray(transaction, 0, data->double_indirect, size, - data->MaxIndirectRange(), data->max_double_indirect_range); + data->MaxIndirectRange(), *maxDoubleIndirect); if (status < B_OK) return status; @@ -1785,8 +1788,11 @@ Inode::ShrinkStream(Transaction &transaction, off_t size) if (array == NULL) break; + off_t *maxIndirect = &data->max_indirect_range; + // gcc 4 work-around: "error: cannot bind packed field + // 'data->data_stream::max_indirect_range' to 'off_t&'" if (FreeStreamArray(transaction, array, fVolume->BlockSize() / sizeof(block_run), - size, offset, data->max_indirect_range) != B_OK) + size, offset, *maxIndirect) != B_OK) return B_IO_ERROR; } if (data->max_direct_range == data->max_indirect_range) { @@ -1797,8 +1803,11 @@ Inode::ShrinkStream(Transaction &transaction, off_t size) } if (data->MaxDirectRange() > size) { off_t offset = 0; + off_t *maxDirect = &data->max_indirect_range; + // gcc 4 work-around: "error: cannot bind packed field + // 'data->data_stream::max_direct_range' to 'off_t&'" status = FreeStreamArray(transaction, data->direct, NUM_DIRECT_BLOCKS, - size, offset, data->max_direct_range); + size, offset, *maxDirect); if (status < B_OK) return status; } diff --git a/src/add-ons/kernel/generic/block_io/block_io.c b/src/add-ons/kernel/generic/block_io/block_io.c index ec26005ef6..0930519a0c 100644 --- a/src/add-ons/kernel/generic/block_io/block_io.c +++ b/src/add-ons/kernel/generic/block_io/block_io.c @@ -30,7 +30,7 @@ struct iovec block_io_buffer_vec[1]; void *block_io_buffer_phys; char *block_io_buffer; phys_vecs block_io_buffer_phys_vec; -static area_id block_io_buffer_area; +area_id block_io_buffer_area; locked_pool_interface *locked_pool; device_manager_info *pnp; diff --git a/src/add-ons/kernel/generic/block_io/wrapper.h b/src/add-ons/kernel/generic/block_io/wrapper.h index a1e24e7de5..303c22cd3a 100644 --- a/src/add-ons/kernel/generic/block_io/wrapper.h +++ b/src/add-ons/kernel/generic/block_io/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 2 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/generic/ide_adapter/wrapper.h b/src/add-ons/kernel/generic/ide_adapter/wrapper.h index 137dbfc84a..2a5e7f42d0 100644 --- a/src/add-ons/kernel/generic/ide_adapter/wrapper.h +++ b/src/add-ons/kernel/generic/ide_adapter/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 4 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/generic/scsi_periph/wrapper.h b/src/add-ons/kernel/generic/scsi_periph/wrapper.h index a1e24e7de5..303c22cd3a 100644 --- a/src/add-ons/kernel/generic/scsi_periph/wrapper.h +++ b/src/add-ons/kernel/generic/scsi_periph/wrapper.h @@ -54,36 +54,36 @@ # define debug_level_error 2 #endif -#define FUNC_NAME DEBUG_MSG_PREFIX __FUNCTION__ ": " +#define FUNC_NAME DEBUG_MSG_PREFIX, __FUNCTION__ #define SHOW_FLOW(seriousness, format, param...) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_FLOW0(seriousness, format) \ do { if( seriousness <= debug_level_flow && seriousness <= DEBUG_MAX_LEVEL_FLOW ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO(seriousness, format, param...) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT \ }} while( 0 ) #define SHOW_INFO0(seriousness, format) \ do { if( seriousness <= debug_level_info && seriousness <= DEBUG_MAX_LEVEL_INFO ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT \ }} while( 0 ) #define SHOW_ERROR(seriousness, format, param...) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME, param ); DEBUG_WAIT_ERROR \ }} while( 0 ) #define SHOW_ERROR0(seriousness, format) \ do { if( seriousness <= debug_level_error && seriousness <= DEBUG_MAX_LEVEL_ERROR ) { \ - dprintf( "%s"##format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ + dprintf( "%s%s: "format"\n", FUNC_NAME); DEBUG_WAIT_ERROR \ }} while( 0 ) #endif /* _BENAPHORE_H */ diff --git a/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp b/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp index c321012102..c23275bd97 100644 --- a/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp +++ b/src/add-ons/kernel/network/interfaces/ppp/PPPManager.cpp @@ -208,7 +208,7 @@ PPPManager::Control(ifnet *ifp, ulong cmd, caddr_t data) ppp_interface_id PPPManager::CreateInterface(const driver_settings *settings, - ppp_interface_id parentID = PPP_UNDEFINED_INTERFACE_ID) + ppp_interface_id parentID) { return _CreateInterface(NULL, settings, parentID); } @@ -216,7 +216,7 @@ PPPManager::CreateInterface(const driver_settings *settings, ppp_interface_id PPPManager::CreateInterfaceWithName(const char *name, - ppp_interface_id parentID = PPP_UNDEFINED_INTERFACE_ID) + ppp_interface_id parentID) { if(!name) return PPP_UNDEFINED_INTERFACE_ID; @@ -531,7 +531,7 @@ PPPManager::ControlInterface(ppp_interface_id ID, uint32 op, void *data, size_t int32 PPPManager::GetInterfaces(ppp_interface_id *interfaces, int32 count, - ppp_interface_filter filter = PPP_REGISTERED_INTERFACES) + ppp_interface_filter filter) { TRACE("PPPManager: GetInterfaces()\n"); @@ -572,7 +572,7 @@ PPPManager::GetInterfaces(ppp_interface_id *interfaces, int32 count, int32 -PPPManager::CountInterfaces(ppp_interface_filter filter = PPP_REGISTERED_INTERFACES) +PPPManager::CountInterfaces(ppp_interface_filter filter) { TRACE("PPPManager: CountInterfaces()\n"); @@ -611,7 +611,7 @@ PPPManager::CountInterfaces(ppp_interface_filter filter = PPP_REGISTERED_INTERFA ppp_interface_entry* -PPPManager::EntryFor(ppp_interface_id ID, int32 *saveIndex = NULL) const +PPPManager::EntryFor(ppp_interface_id ID, int32 *saveIndex) const { TRACE("PPPManager: EntryFor(%ld)\n", ID); @@ -633,7 +633,7 @@ PPPManager::EntryFor(ppp_interface_id ID, int32 *saveIndex = NULL) const ppp_interface_entry* -PPPManager::EntryFor(ifnet *ifp, int32 *saveIndex = NULL) const +PPPManager::EntryFor(ifnet *ifp, int32 *saveIndex) const { if(!ifp) return NULL; @@ -655,7 +655,7 @@ PPPManager::EntryFor(ifnet *ifp, int32 *saveIndex = NULL) const ppp_interface_entry* -PPPManager::EntryFor(const char *name, int32 *saveIndex = NULL) const +PPPManager::EntryFor(const char *name, int32 *saveIndex) const { if(!name) return NULL; diff --git a/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp b/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp index 679e1950c4..07c6a976b6 100644 --- a/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp +++ b/src/add-ons/kernel/network/ppp/ipcp/Protocol.cpp @@ -215,7 +215,7 @@ IPCP::Down() status_t -IPCP::Send(struct mbuf *packet, uint16 protocolNumber = IPCP_PROTOCOL) +IPCP::Send(struct mbuf *packet, uint16 protocolNumber) { TRACE("IPCP: Send(0x%X)\n", protocolNumber); @@ -1373,7 +1373,7 @@ IPCP::SendTerminateRequest() bool -IPCP::SendTerminateAck(struct mbuf *request = NULL) +IPCP::SendTerminateAck(struct mbuf *request) { TRACE("IPCP: SendTerminateAck() state=%d\n", State()); diff --git a/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp b/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp index 0cb7494c9b..dc3bdfafcd 100644 --- a/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp +++ b/src/add-ons/kernel/network/ppp/modem/ModemDevice.cpp @@ -421,7 +421,7 @@ ModemDevice::ConnectionLost() status_t -ModemDevice::Send(struct mbuf *packet, uint16 protocolNumber = 0) +ModemDevice::Send(struct mbuf *packet, uint16 protocolNumber) { #if DEBUG TRACE("ModemDevice: Send()\n"); @@ -525,7 +525,7 @@ ModemDevice::DataReceived(uint8 *buffer, uint32 length) status_t -ModemDevice::Receive(struct mbuf *packet, uint16 protocolNumber = 0) +ModemDevice::Receive(struct mbuf *packet, uint16 protocolNumber) { // we do not need to lock because only the worker_thread calls this method diff --git a/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp b/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp index fa873c0952..3f7a227986 100644 --- a/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp +++ b/src/add-ons/kernel/network/ppp/pppoe/DiscoveryPacket.cpp @@ -8,7 +8,7 @@ #include -DiscoveryPacket::DiscoveryPacket(uint8 code, uint16 sessionID = 0x0000) +DiscoveryPacket::DiscoveryPacket(uint8 code, uint16 sessionID) : fCode(code), fSessionID(sessionID), fInitStatus(B_OK) @@ -16,7 +16,7 @@ DiscoveryPacket::DiscoveryPacket(uint8 code, uint16 sessionID = 0x0000) } -DiscoveryPacket::DiscoveryPacket(struct mbuf *packet, uint32 start = 0) +DiscoveryPacket::DiscoveryPacket(struct mbuf *packet, uint32 start) { // decode packet uint8 *data = mtod(packet, uint8*); @@ -55,7 +55,7 @@ DiscoveryPacket::~DiscoveryPacket() bool -DiscoveryPacket::AddTag(uint16 type, const void *data, uint16 length, int32 index = -1) +DiscoveryPacket::AddTag(uint16 type, const void *data, uint16 length, int32 index) { pppoe_tag *add = (pppoe_tag*) malloc(length + 4); add->type = type; @@ -117,7 +117,7 @@ DiscoveryPacket::TagWithType(uint16 type) const struct mbuf* -DiscoveryPacket::ToMbuf(uint32 MTU, uint32 reserve = ETHER_HDR_LEN) +DiscoveryPacket::ToMbuf(uint32 MTU, uint32 reserve) { struct mbuf *packet = m_gethdr(MT_DATA); packet->m_data += reserve; diff --git a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp index 1807d385e4..c457f6fed6 100644 --- a/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp +++ b/src/add-ons/kernel/network/ppp/pppoe/PPPoEDevice.cpp @@ -253,7 +253,7 @@ PPPoEDevice::CountOutputBytes() const status_t -PPPoEDevice::Send(struct mbuf *packet, uint16 protocolNumber = 0) +PPPoEDevice::Send(struct mbuf *packet, uint16 protocolNumber) { // Send() is only for PPP packets. PPPoE packets are sent directly to ethernet. @@ -313,7 +313,7 @@ PPPoEDevice::Send(struct mbuf *packet, uint16 protocolNumber = 0) status_t -PPPoEDevice::Receive(struct mbuf *packet, uint16 protocolNumber = 0) +PPPoEDevice::Receive(struct mbuf *packet, uint16 protocolNumber) { if(!packet) return B_ERROR; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPConfigurePacket.cpp b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPConfigurePacket.cpp index f09a411dad..8c2fdb767e 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPConfigurePacket.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPConfigurePacket.cpp @@ -92,7 +92,7 @@ KPPPConfigurePacket::SetCode(uint8 code) \sa ppp_configure_item */ bool -KPPPConfigurePacket::AddItem(const ppp_configure_item *item, int32 index = -1) +KPPPConfigurePacket::AddItem(const ppp_configure_item *item, int32 index) { if(!item || item->length < 2) return false; @@ -167,7 +167,7 @@ KPPPConfigurePacket::ItemWithType(uint8 type) const \return The mbuf structure or \c NULL on error (e.g.: too big for given MRU). */ struct mbuf* -KPPPConfigurePacket::ToMbuf(uint32 MRU, uint32 reserve = 0) +KPPPConfigurePacket::ToMbuf(uint32 MRU, uint32 reserve) { struct mbuf *packet = m_gethdr(MT_DATA); packet->m_data += reserve; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp index e436c58b87..289a76398a 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPInterface.cpp @@ -78,7 +78,7 @@ status_t interface_deleter_thread(void *data); */ KPPPInterface::KPPPInterface(const char *name, ppp_interface_entry *entry, ppp_interface_id ID, const driver_settings *settings, - KPPPInterface *parent = NULL) + KPPPInterface *parent) : KPPPLayer(name, PPP_INTERFACE_LEVEL, 2), fID(ID), fSettings(NULL), @@ -833,7 +833,7 @@ KPPPInterface::ProtocolAt(int32 index) const \return Either the object that was found or \c NULL. */ KPPPProtocol* -KPPPInterface::ProtocolFor(uint16 protocolNumber, KPPPProtocol *start = NULL) const +KPPPInterface::ProtocolFor(uint16 protocolNumber, KPPPProtocol *start) const { TRACE("KPPPInterface: ProtocolFor(%X)\n", protocolNumber); @@ -909,7 +909,7 @@ KPPPInterface::ChildAt(int32 index) const //! Enables or disables the auto-reconnect feture. void -KPPPInterface::SetAutoReconnect(bool autoReconnect = true) +KPPPInterface::SetAutoReconnect(bool autoReconnect) { TRACE("KPPPInterface: SetAutoReconnect(%s)\n", autoReconnect ? "true" : "false"); @@ -924,7 +924,7 @@ KPPPInterface::SetAutoReconnect(bool autoReconnect = true) //! Enables or disables the connect-on-demand feature. void -KPPPInterface::SetConnectOnDemand(bool connectOnDemand = true) +KPPPInterface::SetConnectOnDemand(bool connectOnDemand) { // All protocols must check if ConnectOnDemand was enabled/disabled after this // interface went down. This is the only situation where a change is relevant. diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp index f967e68a3f..ac4dddb269 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPLCP.cpp @@ -103,7 +103,7 @@ KPPPLCP::OptionHandlerAt(int32 index) const //! Returns the option handler that can handle options of a given \a type. KPPPOptionHandler* -KPPPLCP::OptionHandlerFor(uint8 type, int32 *start = NULL) const +KPPPLCP::OptionHandlerFor(uint8 type, int32 *start) const { // The iteration style in this method is strange C/C++. // Explanation: I use this style because it makes extending all XXXFor @@ -180,7 +180,7 @@ KPPPLCP::LCPExtensionAt(int32 index) const //! Returns the LCP extension that can handle LCP packets of a given \a code. KPPPLCPExtension* -KPPPLCP::LCPExtensionFor(uint8 code, int32 *start = NULL) const +KPPPLCP::LCPExtensionFor(uint8 code, int32 *start) const { // The iteration style in this method is strange C/C++. // Explanation: I use this style because it makes extending all XXXFor @@ -239,7 +239,7 @@ KPPPLCP::Down() //! Sends a packet to the target (if there is one) or to the interface. status_t -KPPPLCP::Send(struct mbuf *packet, uint16 protocolNumber = PPP_LCP_PROTOCOL) +KPPPLCP::Send(struct mbuf *packet, uint16 protocolNumber) { if(Target()) return Target()->Send(packet, PPP_LCP_PROTOCOL); diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPProtocol.cpp b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPProtocol.cpp index 7f6f712096..372b543cc9 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPProtocol.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPProtocol.cpp @@ -41,8 +41,8 @@ KPPPProtocol::KPPPProtocol(const char *name, ppp_phase activationPhase, uint16 protocolNumber, ppp_level level, int32 addressFamily, uint32 overhead, KPPPInterface& interface, - driver_parameter *settings, int32 flags = PPP_NO_FLAGS, - const char *type = NULL, KPPPOptionHandler *optionHandler = NULL) + driver_parameter *settings, int32 flags, + const char *type, KPPPOptionHandler *optionHandler) : KPPPLayer(name, level, overhead), fActivationPhase(activationPhase), fProtocolNumber(protocolNumber), @@ -156,7 +156,7 @@ KPPPProtocol::StackControl(uint32 op, void *data) A disabled protocol is ignored and Up() is not called! */ void -KPPPProtocol::SetEnabled(bool enabled = true) +KPPPProtocol::SetEnabled(bool enabled) { fEnabled = enabled; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPReportManager.cpp b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPReportManager.cpp index 9dcc71437e..4a1c4803ed 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPReportManager.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPReportManager.cpp @@ -83,7 +83,7 @@ KPPPReportManager::SendReport(thread_id thread, const ppp_report_packet *report) */ void KPPPReportManager::EnableReports(ppp_report_type type, thread_id thread, - int32 flags = PPP_NO_FLAGS) + int32 flags) { if(thread < 0 || type == PPP_ALL_REPORTS) return; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPStateMachine.cpp b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPStateMachine.cpp index 2bbfbc59f5..aec1d32c7d 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPStateMachine.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/KPPPStateMachine.cpp @@ -1331,7 +1331,7 @@ KPPPStateMachine::RTAEvent(struct mbuf *packet) // receive unknown code void KPPPStateMachine::RUCEvent(struct mbuf *packet, uint16 protocolNumber, - uint8 code = PPP_PROTOCOL_REJECT) + uint8 code) { TRACE("KPPPSM: RUCEvent() state=%d phase=%d\n", State(), Phase()); @@ -1835,7 +1835,7 @@ KPPPStateMachine::SendTerminateRequest() bool -KPPPStateMachine::SendTerminateAck(struct mbuf *request = NULL) +KPPPStateMachine::SendTerminateAck(struct mbuf *request) { TRACE("KPPPSM: SendTerminateAck() state=%d phase=%d\n", State(), Phase()); diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPManager.h b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPManager.h index eab3aa4204..dd92c8fda2 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPManager.h +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPManager.h @@ -38,9 +38,9 @@ typedef struct ppp_interface_module_info { //!< Exports needed network module functions. ppp_interface_id (*CreateInterface)(const driver_settings *settings, - ppp_interface_id parentID = PPP_UNDEFINED_INTERFACE_ID); + ppp_interface_id parentID); ppp_interface_id (*CreateInterfaceWithName)(const char *name, - ppp_interface_id parentID = PPP_UNDEFINED_INTERFACE_ID); + ppp_interface_id parentID); bool (*DeleteInterface)(ppp_interface_id ID); // this marks the interface for deletion bool (*RemoveInterface)(ppp_interface_id ID); @@ -53,12 +53,12 @@ typedef struct ppp_interface_module_info { size_t length); int32 (*GetInterfaces)(ppp_interface_id *interfaces, int32 count, - ppp_interface_filter filter = PPP_REGISTERED_INTERFACES); + ppp_interface_filter filter); // make sure interfaces has enough space for count items - int32 (*CountInterfaces)(ppp_interface_filter filter = PPP_REGISTERED_INTERFACES); + int32 (*CountInterfaces)(ppp_interface_filter filter); void (*EnableReports)(ppp_report_type type, thread_id thread, - int32 flags = PPP_NO_FLAGS); + int32 flags); void (*DisableReports)(ppp_report_type type, thread_id thread); bool (*DoesReport)(ppp_report_type type, thread_id thread); } ppp_interface_module_info; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPStateMachine.h b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPStateMachine.h index c089689baf..d281e0de73 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPStateMachine.h +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/KPPPStateMachine.h @@ -16,6 +16,10 @@ class KPPPProtocol; #include +class PPPManager; +class KPPPInterface; +class KPPPLCP; + class KPPPStateMachine { friend class PPPManager; diff --git a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h index 3cfa54c50f..25a7419e77 100644 --- a/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h +++ b/src/add-ons/kernel/network/ppp/shared/libkernelppp/headers/TemplateList.h @@ -31,7 +31,7 @@ #ifdef _KERNEL_MODE #include #else - #include + #include #endif #include @@ -106,7 +106,7 @@ private: // sDefaultItem template -TemplateList::item_t +typename TemplateList::item_t TemplateList::sDefaultItem( DEFAULT_ITEM_SUPPLIER::GetItem()); @@ -134,7 +134,7 @@ TemplateList::~TemplateList() // GetDefaultItem template inline -const TemplateList::item_t & +const typename TemplateList::item_t & TemplateList::GetDefaultItem() const { return sDefaultItem; @@ -143,7 +143,7 @@ TemplateList::GetDefaultItem() const // GetDefaultItem template inline -TemplateList::item_t & +typename TemplateList::item_t & TemplateList::GetDefaultItem() { return sDefaultItem; @@ -315,7 +315,7 @@ TemplateList::IsEmpty() const // ItemAt template -const TemplateList::item_t & +const typename TemplateList::item_t & TemplateList::ItemAt(int32 index) const { if (index >= 0 && index < fItemCount) @@ -325,7 +325,7 @@ TemplateList::ItemAt(int32 index) const // ItemAt template -TemplateList::item_t & +typename TemplateList::item_t & TemplateList::ItemAt(int32 index) { if (index >= 0 && index < fItemCount) @@ -335,7 +335,7 @@ TemplateList::ItemAt(int32 index) // Items template -const TemplateList::item_t * +const typename TemplateList::item_t * TemplateList::Items() const { return fItems; diff --git a/src/add-ons/kernel/network/ppp/shared/libppp/MessageDriverSettingsUtils.cpp b/src/add-ons/kernel/network/ppp/shared/libppp/MessageDriverSettingsUtils.cpp index f8f978d03e..af0d1ff44e 100644 --- a/src/add-ons/kernel/network/ppp/shared/libppp/MessageDriverSettingsUtils.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libppp/MessageDriverSettingsUtils.cpp @@ -19,7 +19,7 @@ static bool AddParameters(const BMessage& message, driver_settings *to); bool FindMessageParameter(const char *name, const BMessage& message, BMessage *save, - int32 *startIndex = NULL) + int32 *startIndex) { // XXX: this should be removed when we can replace BMessage with something better BString string; diff --git a/src/add-ons/kernel/network/ppp/shared/libppp/PPPInterface.cpp b/src/add-ons/kernel/network/ppp/shared/libppp/PPPInterface.cpp index 2ccb5365cc..5d7a357286 100644 --- a/src/add-ons/kernel/network/ppp/shared/libppp/PPPInterface.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libppp/PPPInterface.cpp @@ -25,7 +25,7 @@ \param ID The ID of the new interface. */ -PPPInterface::PPPInterface(ppp_interface_id ID = PPP_UNDEFINED_INTERFACE_ID) +PPPInterface::PPPInterface(ppp_interface_id ID) { fFD = open(get_stack_driver_path(), O_RDWR); @@ -290,7 +290,7 @@ PPPInterface::Down() const */ bool PPPInterface::EnableReports(ppp_report_type type, thread_id thread, - int32 flags = PPP_NO_FLAGS) const + int32 flags) const { ppp_report_request request; request.type = type; diff --git a/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp b/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp index 37af77b98d..ae403efed3 100644 --- a/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp +++ b/src/add-ons/kernel/network/ppp/shared/libppp/PPPManager.cpp @@ -245,7 +245,7 @@ PPPManager::DeleteInterface(ppp_interface_id ID) const */ ppp_interface_id* PPPManager::Interfaces(int32 *count, - ppp_interface_filter filter = PPP_REGISTERED_INTERFACES) const + ppp_interface_filter filter) const { int32 requestCount; ppp_interface_id *interfaces; @@ -278,7 +278,7 @@ PPPManager::Interfaces(int32 *count, //! Use \c Interfaces() instead of this method. int32 PPPManager::GetInterfaces(ppp_interface_id *interfaces, int32 count, - ppp_interface_filter filter = PPP_REGISTERED_INTERFACES) const + ppp_interface_filter filter) const { ppp_get_interfaces_info info; info.interfaces = interfaces; @@ -376,8 +376,7 @@ PPPManager::InterfaceWithName(const char *name) const //! Returns the number of existing interfaces or a negative value on error. int32 -PPPManager::CountInterfaces(ppp_interface_filter filter = - PPP_REGISTERED_INTERFACES) const +PPPManager::CountInterfaces(ppp_interface_filter filter) const { return Control(PPPC_COUNT_INTERFACES, &filter, sizeof(filter)); } @@ -393,7 +392,7 @@ PPPManager::CountInterfaces(ppp_interface_filter filter = */ bool PPPManager::EnableReports(ppp_report_type type, thread_id thread, - int32 flags = PPP_NO_FLAGS) const + int32 flags) const { ppp_report_request request; request.type = type; diff --git a/src/add-ons/media/media-add-ons/mixer/MixerSettings.cpp b/src/add-ons/media/media-add-ons/mixer/MixerSettings.cpp index cab43f047e..f1da39f063 100644 --- a/src/add-ons/media/media-add-ons/mixer/MixerSettings.cpp +++ b/src/add-ons/media/media-add-ons/mixer/MixerSettings.cpp @@ -1,3 +1,5 @@ +#include + #include #include #include diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp index 7682ecd41d..835ee4ec33 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp +++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioAddOn.cpp @@ -211,7 +211,7 @@ status_t MultiAudioAddOn::AutoStart( } status_t -MultiAudioAddOn::RecursiveScan(char* rootPath, BEntry *rootEntry = NULL) +MultiAudioAddOn::RecursiveScan(char* rootPath, BEntry *rootEntry) { CALLED(); diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp index cea77c00ce..40e5bb52c7 100644 --- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp +++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp @@ -954,7 +954,7 @@ MultiAudioNode::AdditionalBufferRequested(const media_source& source, media_buff void MultiAudioNode::HandleEvent( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { //CALLED(); switch (event->type) { @@ -994,7 +994,7 @@ void MultiAudioNode::HandleEvent( status_t MultiAudioNode::HandleBuffer( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { //CALLED(); BBuffer * buffer = const_cast((BBuffer*)event->pointer); @@ -1050,7 +1050,7 @@ status_t MultiAudioNode::HandleBuffer( status_t MultiAudioNode::HandleDataStatus( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { //CALLED(); PRINT(("MultiAudioNode::HandleDataStatus status:%li, lateness:%li\n", event->data, lateness)); @@ -1070,7 +1070,7 @@ status_t MultiAudioNode::HandleDataStatus( status_t MultiAudioNode::HandleStart( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); if (RunState() != B_STARTED) { @@ -1082,7 +1082,7 @@ status_t MultiAudioNode::HandleStart( status_t MultiAudioNode::HandleSeek( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); PRINT(("MultiAudioNode::HandleSeek(t=%lld,d=%li,bd=%lld)\n",event->event_time,event->data,event->bigdata)); @@ -1092,7 +1092,7 @@ status_t MultiAudioNode::HandleSeek( status_t MultiAudioNode::HandleWarp( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); return B_OK; @@ -1101,7 +1101,7 @@ status_t MultiAudioNode::HandleWarp( status_t MultiAudioNode::HandleStop( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); // flush the queue so downstreamers don't get any more @@ -1114,7 +1114,7 @@ status_t MultiAudioNode::HandleStop( status_t MultiAudioNode::HandleParameter( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); return B_OK; diff --git a/src/add-ons/media/plugins/mov_reader/libMOV/MOVFileReader.cpp b/src/add-ons/media/plugins/mov_reader/libMOV/MOVFileReader.cpp index b8241de963..96cdc7b723 100644 --- a/src/add-ons/media/plugins/mov_reader/libMOV/MOVFileReader.cpp +++ b/src/add-ons/media/plugins/mov_reader/libMOV/MOVFileReader.cpp @@ -435,7 +435,7 @@ const mov_main_header *MOVFileReader::MovMainHeader() return &theMainHeader; } -const AudioMetaData *MOVFileReader::AudioFormat(uint32 stream_index, size_t *size = 0) +const AudioMetaData *MOVFileReader::AudioFormat(uint32 stream_index, size_t *size) { if (IsAudio(stream_index)) { diff --git a/src/add-ons/media/plugins/mp3_reader/MP3ReaderPlugin.cpp b/src/add-ons/media/plugins/mp3_reader/MP3ReaderPlugin.cpp index 8382a14048..fba4320fd4 100644 --- a/src/add-ons/media/plugins/mp3_reader/MP3ReaderPlugin.cpp +++ b/src/add-ons/media/plugins/mp3_reader/MP3ReaderPlugin.cpp @@ -23,6 +23,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ #include +#include #include #include #include diff --git a/src/add-ons/media/plugins/musepack/MusePackDecoder.cpp b/src/add-ons/media/plugins/musepack/MusePackDecoder.cpp index 483e318a73..7c291ca581 100644 --- a/src/add-ons/media/plugins/musepack/MusePackDecoder.cpp +++ b/src/add-ons/media/plugins/musepack/MusePackDecoder.cpp @@ -4,6 +4,7 @@ */ #include +#include #include "MusePackDecoder.h" #include "mpc/in_mpc.h" diff --git a/src/add-ons/media/plugins/musepack/mpc/in_mpc.cpp b/src/add-ons/media/plugins/musepack/mpc/in_mpc.cpp index a5ede840fe..1959c3a638 100644 --- a/src/add-ons/media/plugins/musepack/mpc/in_mpc.cpp +++ b/src/add-ons/media/plugins/musepack/mpc/in_mpc.cpp @@ -20,6 +20,7 @@ #include "idtag.h" #include +#include //SettingsMPC PluginSettings; // AB: PluginSettings holds the parameters for the plugin-configuration diff --git a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h index 92ab9bafd6..9773c20a0a 100644 --- a/src/add-ons/media/plugins/ogg/OggReaderPlugin.h +++ b/src/add-ons/media/plugins/ogg/OggReaderPlugin.h @@ -52,6 +52,7 @@ private: // interface for OggStreams ssize_t ReadPage(bool first_page = false); +public: class StreamInterface { public: virtual ssize_t ReadPage() = 0; diff --git a/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp b/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp index 82225d77f8..eef8ea1c9f 100644 --- a/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp +++ b/src/add-ons/media/plugins/vorbis/vorbisCodecPlugin.cpp @@ -201,7 +201,7 @@ VorbisDecoder::Decode(void *buffer, int64 *frameCount, packet.granulepos = -1; packet.packetno = 7; } - packet.packet = static_cast(chunkBuffer); + packet.packet = (unsigned char *)chunkBuffer; packet.bytes = chunkSize; if (!synced) { if (mh.start_time > 0) { diff --git a/src/add-ons/translators/gif/SavePalette.cpp b/src/add-ons/translators/gif/SavePalette.cpp index 57e26d4f0f..82ab952f67 100644 --- a/src/add-ons/translators/gif/SavePalette.cpp +++ b/src/add-ons/translators/gif/SavePalette.cpp @@ -23,6 +23,8 @@ #include #include +using std::nothrow; + extern bool debug; // "web safe palette" diff --git a/src/add-ons/translators/jpeg/JPEGTranslator.cpp b/src/add-ons/translators/jpeg/JPEGTranslator.cpp index 74d794ed79..77dad4de93 100644 --- a/src/add-ons/translators/jpeg/JPEGTranslator.cpp +++ b/src/add-ons/translators/jpeg/JPEGTranslator.cpp @@ -56,16 +56,16 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Translation Kit required globals char translatorName[] = "JPEG translator"; -char translatorInfo[] = "© 2002-2003, Shard - -Based on IJG library © 1991-1998, Thomas G. Lane - http://www.ijg.org/files/ -with \"Lossless\" encoding support patch by Ken Murchison - http://www.oceana.com/ftp/ljpeg/ - -With some colorspace conversion routines by Magnus Hellman - http://www.bebits.com/app/802 -"; +char translatorInfo[] = "© 2002-2003, Shard\n" +"\n" +"Based on IJG library © 1991-1998, Thomas G. Lane\"\n" +" http://www.ijg.org/files/\n" +"with \"Lossless\" encoding support patch by Ken Murchison\n" +" http://www.oceana.com/ftp/ljpeg/\n" +"\n" +"With some colorspace conversion routines by Magnus Hellman\n" +" http://www.bebits.com/app/802\n" +""; int32 translatorVersion = 273; // 256 = v1.0.0 // Define the formats we know how to read diff --git a/src/add-ons/translators/shared/BaseTranslator.cpp b/src/add-ons/translators/shared/BaseTranslator.cpp index e2a9b300de..c23799cc4d 100644 --- a/src/add-ons/translators/shared/BaseTranslator.cpp +++ b/src/add-ons/translators/shared/BaseTranslator.cpp @@ -245,7 +245,7 @@ BaseTranslator::OutputFormats(int32 *out_count) const // --------------------------------------------------------------- status_t BaseTranslator::identify_bits_header(BPositionIO *inSource, - translator_info *outInfo, TranslatorBitmap *pheader = NULL) + translator_info *outInfo, TranslatorBitmap *pheader) { TranslatorBitmap header; diff --git a/src/apps/abouthaiku/AboutHaiku.cpp b/src/apps/abouthaiku/AboutHaiku.cpp index 08bfbf6751..328ac4c5d7 100644 --- a/src/apps/abouthaiku/AboutHaiku.cpp +++ b/src/apps/abouthaiku/AboutHaiku.cpp @@ -107,8 +107,8 @@ AboutWindow::QuitRequested() } -AboutView::AboutView(const BRect &r) - : BView(r, "aboutview", B_FOLLOW_ALL, B_WILL_DRAW | B_PULSE_NEEDED), +AboutView::AboutView(const BRect &rect) + : BView(rect, "aboutview", B_FOLLOW_ALL, B_WILL_DRAW | B_PULSE_NEEDED), fLastActionTime(system_time()), fScrollRunner(NULL) { diff --git a/src/apps/diskprobe/AttributeWindow.cpp b/src/apps/diskprobe/AttributeWindow.cpp index 43e636060f..6e661d0e33 100644 --- a/src/apps/diskprobe/AttributeWindow.cpp +++ b/src/apps/diskprobe/AttributeWindow.cpp @@ -168,9 +168,9 @@ EditorTabView::SetTypeEditorTab(BView *view) // #pragma mark - -AttributeWindow::AttributeWindow(BRect rect, entry_ref *ref, const char *attribute, +AttributeWindow::AttributeWindow(BRect _rect, entry_ref *ref, const char *attribute, const BMessage *settings) - : ProbeWindow(rect, ref), + : ProbeWindow(_rect, ref), fAttribute(strdup(attribute)) { // Set alternative window title for devices diff --git a/src/apps/diskprobe/DataEditor.cpp b/src/apps/diskprobe/DataEditor.cpp index eccb796ada..9737c6f62a 100644 --- a/src/apps/diskprobe/DataEditor.cpp +++ b/src/apps/diskprobe/DataEditor.cpp @@ -947,7 +947,7 @@ DataEditor::Update() status_t -DataEditor::UpdateIfNeeded(bool *_updated = NULL) +DataEditor::UpdateIfNeeded(bool *_updated) { if (!fNeedsUpdate) { if (_updated) diff --git a/src/apps/diskprobe/FileWindow.cpp b/src/apps/diskprobe/FileWindow.cpp index d0844ee7cb..0eb264c254 100644 --- a/src/apps/diskprobe/FileWindow.cpp +++ b/src/apps/diskprobe/FileWindow.cpp @@ -80,9 +80,9 @@ FileWindow::FileWindow(BRect rect, entry_ref *ref, const BMessage *settings) // add our interface widgets - BRect rect = Bounds(); - rect.top = menuBar->Bounds().Height() + 1; - fProbeView = new ProbeView(rect, ref, NULL, settings); + BRect _rect = Bounds(); + _rect.top = menuBar->Bounds().Height() + 1; + fProbeView = new ProbeView(_rect, ref, NULL, settings); AddChild(fProbeView); fProbeView->AddSaveMenuItems(menu, 4); diff --git a/src/apps/diskprobe/FindWindow.cpp b/src/apps/diskprobe/FindWindow.cpp index dc6d976bb6..d0c91591e9 100644 --- a/src/apps/diskprobe/FindWindow.cpp +++ b/src/apps/diskprobe/FindWindow.cpp @@ -351,9 +351,9 @@ FindTextView::GetData(BMessage &message) // #pragma mark - -FindWindow::FindWindow(BRect rect, BMessage &previous, BMessenger &target, +FindWindow::FindWindow(BRect _rect, BMessage &previous, BMessenger &target, const BMessage *settings) - : BWindow(rect, "Find", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS), + : BWindow(_rect, "Find", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS), fTarget(target) { BView *view = new BView(Bounds(), "main", B_FOLLOW_ALL, 0); diff --git a/src/apps/expander/ExpanderSettings.cpp b/src/apps/expander/ExpanderSettings.cpp index d56447cd7f..a043ad6a30 100644 --- a/src/apps/expander/ExpanderSettings.cpp +++ b/src/apps/expander/ExpanderSettings.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include // Format of Expander_Settings diff --git a/src/apps/pulse/ConfigView.cpp b/src/apps/pulse/ConfigView.cpp index 7d404a4c2d..301bbc8194 100644 --- a/src/apps/pulse/ConfigView.cpp +++ b/src/apps/pulse/ConfigView.cpp @@ -15,6 +15,7 @@ #include #include #include +#include RTColorControl::RTColorControl(BPoint point, BMessage *message) : BColorControl(point, B_CELLS_32x8, 6, "ColorControl", message, false) { diff --git a/src/apps/showimage/ShowImageView.cpp b/src/apps/showimage/ShowImageView.cpp index ebc0a72d7d..b692a5fe1f 100644 --- a/src/apps/showimage/ShowImageView.cpp +++ b/src/apps/showimage/ShowImageView.cpp @@ -60,6 +60,8 @@ #include "ShowImageView.h" #include "ShowImageWindow.h" +using std::nothrow; + #ifndef min #define min(a,b) ((a)>(b)?(b):(a)) #endif diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp index bc5a8bc51b..7e773cc5a8 100644 --- a/src/apps/showimage/ShowImageWindow.cpp +++ b/src/apps/showimage/ShowImageWindow.cpp @@ -56,7 +56,7 @@ // Implementation of RecentDocumentsMenu -RecentDocumentsMenu::RecentDocumentsMenu(const char *title, menu_layout layout = B_ITEMS_IN_COLUMN) +RecentDocumentsMenu::RecentDocumentsMenu(const char *title, menu_layout layout) : BMenu(title, layout) { } diff --git a/src/apps/soundrecorder/TrackSlider.cpp b/src/apps/soundrecorder/TrackSlider.cpp index 9ebefdf774..99569a5e13 100644 --- a/src/apps/soundrecorder/TrackSlider.cpp +++ b/src/apps/soundrecorder/TrackSlider.cpp @@ -6,6 +6,7 @@ */ #include +#include #include "TrackSlider.h" #include "icon_button.h" diff --git a/src/apps/soundrecorder/TransportButton.cpp b/src/apps/soundrecorder/TransportButton.cpp index 348ad2bb99..f63b6d7969 100644 --- a/src/apps/soundrecorder/TransportButton.cpp +++ b/src/apps/soundrecorder/TransportButton.cpp @@ -15,6 +15,8 @@ #include "TransportButton.h" #include "DrawingTidbits.h" +using std::map; + class BitmapStash { // Bitmap stash is a simple class to hold all the lazily-allocated // bitmaps that the TransportButton needs when rendering itself. diff --git a/src/apps/soundrecorder/UpDownButton.cpp b/src/apps/soundrecorder/UpDownButton.cpp index 2819a0f09d..9909c6337d 100644 --- a/src/apps/soundrecorder/UpDownButton.cpp +++ b/src/apps/soundrecorder/UpDownButton.cpp @@ -7,8 +7,8 @@ #include "UpDownButton.h" #include "icon_button.h" -UpDownButton::UpDownButton(BRect rect, BMessage *msg, uint32 resizeFlags) - : BControl(rect, "button", NULL, msg, resizeFlags, B_WILL_DRAW), +UpDownButton::UpDownButton(BRect _rect, BMessage *msg, uint32 resizeFlags) + : BControl(_rect, "button", NULL, msg, resizeFlags, B_WILL_DRAW), fLastValue(B_CONTROL_ON) { BRect rect = BRect(0, 0, kUpDownButtonWidth - 1, kUpDownButtonHeight - 1); diff --git a/src/apps/stylededit/StyledEditApp.cpp b/src/apps/stylededit/StyledEditApp.cpp index 9e6c84444b..a3d86d14e8 100644 --- a/src/apps/stylededit/StyledEditApp.cpp +++ b/src/apps/stylededit/StyledEditApp.cpp @@ -90,7 +90,7 @@ void StyledEditApp::DispatchMessage(BMessage *msg, BHandler *handler) if (msg->FindInt32("argc",&argc) != B_OK) { argc=0; } - const char ** argv = new (const char*)[argc]; + const char ** argv = new const char*[argc]; for (int arg = 0; (arg < argc) ; arg++) { if (msg->FindString("argv",arg,&argv[arg]) != B_OK) { argv[arg] = ""; diff --git a/src/bin/addattr/main.cpp b/src/bin/addattr/main.cpp index 6dee6e0574..a8d2addb92 100644 --- a/src/bin/addattr/main.cpp +++ b/src/bin/addattr/main.cpp @@ -12,6 +12,7 @@ #include #include +#include #include diff --git a/src/bin/df.cpp b/src/bin/df.cpp index 2793c0f255..e1c7bac21e 100644 --- a/src/bin/df.cpp +++ b/src/bin/df.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/src/bin/dstcheck.cpp b/src/bin/dstcheck.cpp index 77e08e2237..97e4f4dbe2 100644 --- a/src/bin/dstcheck.cpp +++ b/src/bin/dstcheck.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2004, Jérôme Duval, jerome.duval@free.fr. + * Copyright 2004, J��e Duval, jerome.duval@free.fr. * Distributed under the terms of the MIT License. */ @@ -11,6 +11,7 @@ #include #include #include +#include const uint32 TIMEDALERT_UPDATE = 'taup'; @@ -32,8 +33,8 @@ computer's clock may be an hour off. Currently,\nyour computer thinks it is " #define STRING2 ".\n\nIs this the correct time?" TimedAlert::TimedAlert(const char *title, const char *text, const char *button1, - const char *button2 = NULL, const char *button3 = NULL, - button_width width = B_WIDTH_AS_USUAL, alert_type type = B_INFO_ALERT) + const char *button2, const char *button3, + button_width width, alert_type type) : BAlert(title, text, button1, button2, button3, width, type), fRunner(NULL) { diff --git a/src/bin/mkindex.cpp b/src/bin/mkindex.cpp index bba37a9fab..bf90255d11 100644 --- a/src/bin/mkindex.cpp +++ b/src/bin/mkindex.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include diff --git a/src/bin/mountvolume.cpp b/src/bin/mountvolume.cpp index 7ea1095c76..bf12d74091 100644 --- a/src/bin/mountvolume.cpp +++ b/src/bin/mountvolume.cpp @@ -20,6 +20,9 @@ #include #include +using std::set; +using std::string; + extern const char *__progname; diff --git a/src/bin/ppp_up/ConnectionView.cpp b/src/bin/ppp_up/ConnectionView.cpp index 9226786760..3717fd2efd 100644 --- a/src/bin/ppp_up/ConnectionView.cpp +++ b/src/bin/ppp_up/ConnectionView.cpp @@ -20,9 +20,10 @@ #include #include -#include +#include // for max() +using std::max; // GUI constants static const uint32 kDefaultButtonWidth = 80; diff --git a/src/bin/ppp_up/PPPDeskbarReplicant.cpp b/src/bin/ppp_up/PPPDeskbarReplicant.cpp index 48b071efd2..dfdcbffd97 100644 --- a/src/bin/ppp_up/PPPDeskbarReplicant.cpp +++ b/src/bin/ppp_up/PPPDeskbarReplicant.cpp @@ -60,7 +60,7 @@ PPPDeskbarReplicant::Instantiate(BMessage *data) status_t -PPPDeskbarReplicant::Archive(BMessage *data, bool deep = true) const +PPPDeskbarReplicant::Archive(BMessage *data, bool deep) const { BView::Archive(data, deep); diff --git a/src/bin/roster.cpp b/src/bin/roster.cpp index 70f91c35af..ae611b3e84 100644 --- a/src/bin/roster.cpp +++ b/src/bin/roster.cpp @@ -15,6 +15,7 @@ #include #include +#include #include diff --git a/src/bin/strace/Jamfile b/src/bin/strace/Jamfile index fef805f692..4638383a7d 100644 --- a/src/bin/strace/Jamfile +++ b/src/bin/strace/Jamfile @@ -40,7 +40,7 @@ for i in $(straceSyscallsIndices) { OPTIM = $(oldOptim) ; BinCommand strace : $(straceSources) - : $(straceSyscallsObjects) libroot.so libstdc++.r4.so ; + : $(straceSyscallsObjects) libroot.so $(TARGET_LIBSTDC++) ; # We need to specify the dependency on the generated syscalls file explicitly. Includes $(straceSyscallsSource) : strace_syscalls.h ; diff --git a/src/bin/strace/MemoryReader.cpp b/src/bin/strace/MemoryReader.cpp index c683dbe40f..8b57c189a0 100644 --- a/src/bin/strace/MemoryReader.cpp +++ b/src/bin/strace/MemoryReader.cpp @@ -4,6 +4,7 @@ */ #include +#include #include #include diff --git a/src/bin/strace/Syscall.h b/src/bin/strace/Syscall.h index 6ae1317cf5..a59904ea76 100644 --- a/src/bin/strace/Syscall.h +++ b/src/bin/strace/Syscall.h @@ -12,6 +12,9 @@ #include "TypeHandler.h" +using std::string; +using std::vector; + // Type class Type { public: diff --git a/src/bin/strace/TypeHandler.cpp b/src/bin/strace/TypeHandler.cpp index 6720c7899d..70a2d959aa 100644 --- a/src/bin/strace/TypeHandler.cpp +++ b/src/bin/strace/TypeHandler.cpp @@ -25,23 +25,23 @@ public: template static inline string -get_number_value(const void *address, const char *format) +get_number_value(value_t value, const char *format) { - if (sizeof(align_t) > sizeof(value_t)) - return get_number_value(value_t(*(align_t*)address), format); - else - return get_number_value(*(value_t*)address, format); + char buffer[32]; + sprintf(buffer, format, value); + return buffer; } // get_number_value template static inline string -get_number_value(value_t value, const char *format) +get_number_value(const void *address, const char *format) { - char buffer[32]; - sprintf(buffer, format, value); - return buffer; + if (sizeof(align_t) > sizeof(value_t)) + return get_number_value(value_t(*(align_t*)address), format); + else + return get_number_value(*(value_t*)address, format); } // get_pointer_value diff --git a/src/bin/strace/TypeHandler.h b/src/bin/strace/TypeHandler.h index fb0825e1bb..fefb44fa9e 100644 --- a/src/bin/strace/TypeHandler.h +++ b/src/bin/strace/TypeHandler.h @@ -10,6 +10,8 @@ #include #include +using std::string; + class MemoryReader; typedef FUNCTION_CALL_PARAMETER_ALIGNMENT_TYPE align_t; diff --git a/src/bin/strace/strace.cpp b/src/bin/strace/strace.cpp index 5a5ea4db6f..a41587207e 100644 --- a/src/bin/strace/strace.cpp +++ b/src/bin/strace/strace.cpp @@ -21,6 +21,10 @@ #include "Syscall.h" #include "TypeHandler.h" +using std::map; +using std::string; +using std::vector; + extern void get_syscalls0(vector &syscalls); extern void get_syscalls1(vector &syscalls); extern void get_syscalls2(vector &syscalls); diff --git a/src/kits/debug/SymbolLookup.cpp b/src/kits/debug/SymbolLookup.cpp index 8ecbbd1b59..c749048890 100644 --- a/src/kits/debug/SymbolLookup.cpp +++ b/src/kits/debug/SymbolLookup.cpp @@ -8,6 +8,7 @@ #include "SymbolLookup.h" +using std::nothrow; using namespace BPrivate; // PrepareAddress diff --git a/src/kits/debug/debug_support.cpp b/src/kits/debug/debug_support.cpp index 43858d0e73..60cff4620d 100644 --- a/src/kits/debug/debug_support.cpp +++ b/src/kits/debug/debug_support.cpp @@ -13,6 +13,8 @@ #include "arch_debug_support.h" #include "SymbolLookup.h" +using std::nothrow; + struct debug_symbol_lookup_context { debug_context context; SymbolLookup *lookup; diff --git a/src/kits/game/GameSound.cpp b/src/kits/game/GameSound.cpp index daf7d0e563..3e0f312911 100644 --- a/src/kits/game/GameSound.cpp +++ b/src/kits/game/GameSound.cpp @@ -27,6 +27,7 @@ // Standard Includes ----------------------------------------------------------- #include +#include // System Includes ------------------------------------------------------------- @@ -37,6 +38,8 @@ // Local Includes -------------------------------------------------------------- #include +using std::nothrow; + // Local Defines --------------------------------------------------------------- // BGameSound class ------------------------------------------------------------ @@ -210,7 +213,7 @@ BGameSound::operator new(size_t size) void * -BGameSound::operator new(size_t size, const nothrow_t &nt) throw() +BGameSound::operator new(size_t size, const std::nothrow_t &nt) throw() { return ::operator new(size, nt); } @@ -226,7 +229,7 @@ BGameSound::operator delete(void *ptr) #if !__MWERKS__ // there's a bug in MWCC under R4.1 and earlier void -BGameSound::operator delete(void *ptr, const nothrow_t &nt) throw() +BGameSound::operator delete(void *ptr, const std::nothrow_t &nt) throw() { ::operator delete(ptr, nt); } diff --git a/src/kits/game/PushGameSound.cpp b/src/kits/game/PushGameSound.cpp index 61e5f8814e..224e9d2fee 100644 --- a/src/kits/game/PushGameSound.cpp +++ b/src/kits/game/PushGameSound.cpp @@ -25,6 +25,7 @@ //------------------------------------------------------------------------------ // Standard Includes ----------------------------------------------------------- +#include // System Includes ------------------------------------------------------------- #include diff --git a/src/kits/interface/Font.cpp b/src/kits/interface/Font.cpp index fb596a1c7b..dd0a9aff68 100644 --- a/src/kits/interface/Font.cpp +++ b/src/kits/interface/Font.cpp @@ -30,6 +30,7 @@ #include #include +using namespace std; const float kUninitializedAscent = INFINITY; const uint32 kUninitializedExtraFlags = 0xffffffff; diff --git a/src/kits/interface/Menu.cpp b/src/kits/interface/Menu.cpp index bf2cf2fb42..b99f9f4852 100644 --- a/src/kits/interface/Menu.cpp +++ b/src/kits/interface/Menu.cpp @@ -7,6 +7,7 @@ * Stefano Ceccherini (burton666@libero.it) */ +#include #include #include diff --git a/src/kits/interface/Shape.cpp b/src/kits/interface/Shape.cpp index fae533a6df..6c27066577 100644 --- a/src/kits/interface/Shape.cpp +++ b/src/kits/interface/Shape.cpp @@ -11,7 +11,7 @@ */ #include - +#include #include #include diff --git a/src/kits/interface/Shelf.cpp b/src/kits/interface/Shelf.cpp index 69680196c3..b28a262d89 100644 --- a/src/kits/interface/Shelf.cpp +++ b/src/kits/interface/Shelf.cpp @@ -26,6 +26,7 @@ #include #include +#include extern "C" void _ReservedShelf1__6BShelfFv(BShelf *const, int32, diff --git a/src/kits/media/ChunkCache.cpp b/src/kits/media/ChunkCache.cpp index 0d123adb54..47ca610242 100644 --- a/src/kits/media/ChunkCache.cpp +++ b/src/kits/media/ChunkCache.cpp @@ -22,6 +22,8 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include + #include #include "ChunkCache.h" diff --git a/src/kits/media/MediaNode.cpp b/src/kits/media/MediaNode.cpp index ef0860606b..607a90d65b 100644 --- a/src/kits/media/MediaNode.cpp +++ b/src/kits/media/MediaNode.cpp @@ -44,6 +44,9 @@ #include "TimeSourceObject.h" #include "TimeSourceObjectManager.h" +using std::nothrow; +using std::nothrow_t; + // don't rename this one, it's used and exported for binary compatibility int32 BMediaNode::_m_changeTag = 0; diff --git a/src/kits/media/Sound.cpp b/src/kits/media/Sound.cpp index 50468d5786..604e0a1164 100644 --- a/src/kits/media/Sound.cpp +++ b/src/kits/media/Sound.cpp @@ -14,13 +14,13 @@ BSound::BSound( void * data, size_t size, const media_raw_audio_format & format, - bool free_when_done = false) + bool free_when_done) { UNIMPLEMENTED(); } BSound::BSound( const entry_ref * sound_file, - bool load_into_memory = false) + bool load_into_memory) { UNIMPLEMENTED(); } diff --git a/src/kits/media/SoundPlayNode.cpp b/src/kits/media/SoundPlayNode.cpp index b4d42348b5..71941f7006 100644 --- a/src/kits/media/SoundPlayNode.cpp +++ b/src/kits/media/SoundPlayNode.cpp @@ -519,7 +519,7 @@ _SoundPlayNode::LatencyChanged(const media_source& source, const media_destinati void _SoundPlayNode::HandleEvent( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); switch (event->type) { @@ -632,7 +632,7 @@ status_t _SoundPlayNode::HandleDataStatus( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { TRACE("_SoundPlayNode::HandleDataStatus status: %li, lateness: %Li\n", event->data, lateness); switch(event->data) { @@ -652,7 +652,7 @@ status_t _SoundPlayNode::HandleStart( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); // don't do anything if we're already running @@ -679,7 +679,7 @@ status_t _SoundPlayNode::HandleSeek( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); TRACE("_SoundPlayNode::HandleSeek(t=%lld, d=%li, bd=%lld)\n", event->event_time, event->data, event->bigdata); @@ -690,7 +690,7 @@ status_t _SoundPlayNode::HandleWarp( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); return B_OK; @@ -700,7 +700,7 @@ status_t _SoundPlayNode::HandleStop( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); // flush the queue so downstreamers don't get any more @@ -713,7 +713,7 @@ status_t _SoundPlayNode::HandleParameter( const media_timed_event *event, bigtime_t lateness, - bool realTimeEvent = false) + bool realTimeEvent) { CALLED(); return B_OK; diff --git a/src/kits/media/TimeCode.cpp b/src/kits/media/TimeCode.cpp index dfa53e94a2..40be86bdd2 100644 --- a/src/kits/media/TimeCode.cpp +++ b/src/kits/media/TimeCode.cpp @@ -7,7 +7,7 @@ #include "debug.h" #include -status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL) +status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code) { int32 l_frames; @@ -35,7 +35,7 @@ status_t us_to_timecode(bigtime_t micros, int * hours, int * minutes, int * seco return frames_to_timecode(l_frames, hours, minutes, seconds, frames, code); } -status_t timecode_to_us(int hours, int minutes, int seconds, int frames, bigtime_t * micros, const timecode_info * code = NULL) +status_t timecode_to_us(int hours, int minutes, int seconds, int frames, bigtime_t * micros, const timecode_info * code) { int32 l_frames; @@ -67,7 +67,7 @@ status_t timecode_to_us(int hours, int minutes, int seconds, int frames, bigtime return B_ERROR; } -status_t frames_to_timecode(int32 l_frames, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code = NULL) +status_t frames_to_timecode(int32 l_frames, int * hours, int * minutes, int * seconds, int * frames, const timecode_info * code) { int fps_div; int total_mins; @@ -139,7 +139,7 @@ status_t frames_to_timecode(int32 l_frames, int * hours, int * minutes, int * se return B_OK; } -status_t timecode_to_frames(int hours, int minutes, int seconds, int frames, int32 * l_frames, const timecode_info * code = NULL) +status_t timecode_to_frames(int hours, int minutes, int seconds, int frames, int32 * l_frames, const timecode_info * code) { int fps_div; int total_mins; diff --git a/src/kits/media/TimeSourceObject.cpp b/src/kits/media/TimeSourceObject.cpp index 352a9b2cf3..698e160e36 100644 --- a/src/kits/media/TimeSourceObject.cpp +++ b/src/kits/media/TimeSourceObject.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include "MediaMisc.h" #include "TimeSourceObject.h" diff --git a/src/kits/media/TimedEventQueuePrivate.cpp b/src/kits/media/TimedEventQueuePrivate.cpp index 31f37379a1..b4f0ee8d4d 100644 --- a/src/kits/media/TimedEventQueuePrivate.cpp +++ b/src/kits/media/TimedEventQueuePrivate.cpp @@ -37,6 +37,8 @@ #include "Debug.h" #include "debug.h" +#include + _event_queue_imp::_event_queue_imp() : fLock(new BLocker("BTimedEventQueue locker")), fEventCount(0), diff --git a/src/kits/network/libnetapi/NetEndpoint.cpp b/src/kits/network/libnetapi/NetEndpoint.cpp index 072aabd5bf..bc28ba07d2 100644 --- a/src/kits/network/libnetapi/NetEndpoint.cpp +++ b/src/kits/network/libnetapi/NetEndpoint.cpp @@ -107,7 +107,7 @@ BNetEndpoint::~BNetEndpoint() // #pragma mark - -status_t BNetEndpoint::Archive(BMessage *into, bool deep = true) const +status_t BNetEndpoint::Archive(BMessage *into, bool deep) const { // TODO diff --git a/src/kits/storage/Partition.cpp b/src/kits/storage/Partition.cpp index 8573b034c9..5209072186 100644 --- a/src/kits/storage/Partition.cpp +++ b/src/kits/storage/Partition.cpp @@ -24,6 +24,8 @@ #include #include +using std::nothrow; + /*! \class BPartition \brief A BPartition object represent a partition and provides a lot of methods to retrieve information about it and some to manipulate it. diff --git a/src/kits/storage/ResourceFile.cpp b/src/kits/storage/ResourceFile.cpp index c7ebc732bb..64ffc48540 100644 --- a/src/kits/storage/ResourceFile.cpp +++ b/src/kits/storage/ResourceFile.cpp @@ -21,7 +21,9 @@ #include "ResourcesDefs.h" //#include "Warnings.h" -using namespace std; +using std::max; +using std::min; +using std::nothrow; namespace BPrivate { namespace Storage { diff --git a/src/kits/storage/storage_support.cpp b/src/kits/storage/storage_support.cpp index c1b18eddca..263ff5eb39 100644 --- a/src/kits/storage/storage_support.cpp +++ b/src/kits/storage/storage_support.cpp @@ -18,7 +18,7 @@ #include "storage_support.h" -using namespace std; +using std::nothrow; namespace BPrivate { namespace Storage { diff --git a/src/kits/support/Beep.cpp b/src/kits/support/Beep.cpp index e98b643c4a..6887d65db5 100644 --- a/src/kits/support/Beep.cpp +++ b/src/kits/support/Beep.cpp @@ -25,7 +25,7 @@ beep() status_t -add_system_beep_event(const char *eventName, uint32 flags _BEEP_FLAGS) +add_system_beep_event(const char *eventName, uint32 flags) { // ToDo: ask media server to add beep event return B_ERROR; diff --git a/src/kits/support/PointerList.cpp b/src/kits/support/PointerList.cpp index 4d2ec577a0..a09349a0a9 100644 --- a/src/kits/support/PointerList.cpp +++ b/src/kits/support/PointerList.cpp @@ -16,11 +16,14 @@ // Note: Method Owning() is inlined in header file ObjectList.h -#include +#include +#include #include #include +using namespace std; + // If USE_STL is 1 binary search and sort are used from STL. // The implementation of _PointerList_ should be completely rewritten to // use STL in a more efficent way! diff --git a/src/kits/textencoding/character_sets.cpp b/src/kits/textencoding/character_sets.cpp index a4eaa7871c..0f4492f8e9 100644 --- a/src/kits/textencoding/character_sets.cpp +++ b/src/kits/textencoding/character_sets.cpp @@ -308,7 +308,7 @@ public: } } // initializing extern variables - character_sets_by_MIBenum = new (const BCharacterSet*)[max_MIBenum+2]; + character_sets_by_MIBenum = new const BCharacterSet*[max_MIBenum+2]; maximum_valid_MIBenum = max_MIBenum; // initializing MIBenum array memset(character_sets_by_MIBenum,0,sizeof(BCharacterSet*)*(max_MIBenum+2)); diff --git a/src/kits/textencoding/utf8_conversions.cpp b/src/kits/textencoding/utf8_conversions.cpp index b985629525..9ac9693895 100644 --- a/src/kits/textencoding/utf8_conversions.cpp +++ b/src/kits/textencoding/utf8_conversions.cpp @@ -110,7 +110,7 @@ status_t convert_to_utf8(uint32 srcEncoding, const char * src, int32 * srcLen, char * dst, int32 * dstLen, - int32 * state, char substitute = B_SUBSTITUTE) + int32 * state, char substitute) { const BCharacterSet * charset = BCharacterSetRoster::GetCharacterSetByConversionID(srcEncoding); if (charset == 0) { @@ -130,7 +130,7 @@ status_t convert_from_utf8(uint32 dstEncoding, const char * src, int32 * srcLen, char * dst, int32 * dstLen, - int32 * state, char substitute = B_SUBSTITUTE) + int32 * state, char substitute) { const BCharacterSet * charset = BCharacterSetRoster::GetCharacterSetByConversionID(dstEncoding); if (charset == 0) { diff --git a/src/preferences/backgrounds/BGView.cpp b/src/preferences/backgrounds/BGView.cpp index 22d1b047b2..bb888c053c 100644 --- a/src/preferences/backgrounds/BGView.cpp +++ b/src/preferences/backgrounds/BGView.cpp @@ -787,7 +787,7 @@ BGView::LoadSettings(void) void -SetRGBColor(rgb_color *col,uint8 r, uint8 g, uint8 b, uint8 a=255) +SetRGBColor(rgb_color *col,uint8 r, uint8 g, uint8 b, uint8 a) { col->red=r; col->green=g; diff --git a/src/preferences/datatranslations/DataTranslationsView.cpp b/src/preferences/datatranslations/DataTranslationsView.cpp index 4ea310678f..a1f9ba65d2 100644 --- a/src/preferences/datatranslations/DataTranslationsView.cpp +++ b/src/preferences/datatranslations/DataTranslationsView.cpp @@ -12,7 +12,7 @@ DataTranslationsView::DataTranslationsView(BRect rect, const char *name, - list_view_type type = B_SINGLE_SELECTION_LIST) + list_view_type type) : BListView(rect, name, B_SINGLE_SELECTION_LIST, B_FOLLOW_ALL_SIDES) { } diff --git a/src/preferences/filetypes/FileTypesApp.cpp b/src/preferences/filetypes/FileTypesApp.cpp index c7755ebe4f..ceae79e36c 100644 --- a/src/preferences/filetypes/FileTypesApp.cpp +++ b/src/preferences/filetypes/FileTypesApp.cpp @@ -24,7 +24,7 @@ void FileTypesApp::DispatchMessage(BMessage *msg, BHandler *handler) if (msg->FindInt32("argc",&argc) != B_OK) { argc=0; } - const char ** argv = new (const char*)[argc]; + const char ** argv = new const char*[argc]; for (int arg = 0; (arg < argc) ; arg++) { if (msg->FindString("argv",arg,&argv[arg]) != B_OK) { argv[arg] = ""; diff --git a/src/preferences/fonts/FontSelectionView.cpp b/src/preferences/fonts/FontSelectionView.cpp index 6034454413..94272db352 100644 --- a/src/preferences/fonts/FontSelectionView.cpp +++ b/src/preferences/fonts/FontSelectionView.cpp @@ -66,9 +66,9 @@ _get_system_default_font_(const char* which, font_family family, // #pragma mark - -FontSelectionView::FontSelectionView(BRect rect, const char* name, +FontSelectionView::FontSelectionView(BRect _rect, const char* name, const char* label, const BFont& currentFont) - : BView(rect, name, B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW), + : BView(_rect, name, B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW), fSavedFont(currentFont), fCurrentFont(currentFont) { diff --git a/src/preferences/fonts/FontView.cpp b/src/preferences/fonts/FontView.cpp index b00ec6818d..5f63a16f5a 100644 --- a/src/preferences/fonts/FontView.cpp +++ b/src/preferences/fonts/FontView.cpp @@ -12,8 +12,8 @@ #include "FontView.h" -FontView::FontView(BRect rect) - : BView(rect, "Fonts", B_FOLLOW_ALL, B_WILL_DRAW) +FontView::FontView(BRect _rect) + : BView(_rect, "Fonts", B_FOLLOW_ALL, B_WILL_DRAW) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); BRect rect(Bounds()); diff --git a/src/preferences/keymap/KeymapTextView.cpp b/src/preferences/keymap/KeymapTextView.cpp index f19f5acb47..3957b2fa09 100644 --- a/src/preferences/keymap/KeymapTextView.cpp +++ b/src/preferences/keymap/KeymapTextView.cpp @@ -20,7 +20,7 @@ KeymapTextView::KeymapTextView(BRect frame, const char *name, BRect textRect, uint32 resizeMask, - uint32 flags = B_WILL_DRAW | B_PULSE_NEEDED) : + uint32 flags) : BTextView(frame, name, textRect, resizeMask, flags) { diff --git a/src/preferences/media/MediaAlert.cpp b/src/preferences/media/MediaAlert.cpp index 34f0b81f54..6fef2a7b12 100644 --- a/src/preferences/media/MediaAlert.cpp +++ b/src/preferences/media/MediaAlert.cpp @@ -58,8 +58,8 @@ class TAlertView : public BView }; //------------------------------------------------------------------------------ -MediaAlert::MediaAlert(BRect rect, const char* title, const char* text) - : BWindow(rect, title, B_MODAL_WINDOW, +MediaAlert::MediaAlert(BRect _rect, const char* title, const char* text) + : BWindow(_rect, title, B_MODAL_WINDOW, B_NOT_CLOSABLE | B_NOT_RESIZABLE) { fTextView = NULL; diff --git a/src/preferences/media/MediaListItem.cpp b/src/preferences/media/MediaListItem.cpp index 6516b2c454..3dcdb07ae2 100644 --- a/src/preferences/media/MediaListItem.cpp +++ b/src/preferences/media/MediaListItem.cpp @@ -15,6 +15,8 @@ // Includes -------------------------------------------------------------------------------------------------- // +#include + #include #include "MediaListItem.h" @@ -22,7 +24,7 @@ #define kITEM_MARGIN 1 // MediaListItem - Constructor -MediaListItem::MediaListItem(dormant_node_info *info, uint32 level, bool isVideo, BList *icons, uint32 modifiers=0) +MediaListItem::MediaListItem(dormant_node_info *info, uint32 level, bool isVideo, BList *icons, uint32 modifiers) : BListItem(level), mIsAudioMixer(false), mIsVideo(isVideo), @@ -36,7 +38,7 @@ MediaListItem::MediaListItem(dormant_node_info *info, uint32 level, bool isVideo SetHeight(16 + kITEM_MARGIN); } -MediaListItem::MediaListItem(const char *label, uint32 level, bool isVideo, BList *icons, uint32 modifiers=0) +MediaListItem::MediaListItem(const char *label, uint32 level, bool isVideo, BList *icons, uint32 modifiers) : BListItem(level), mLabel(label), mIsAudioMixer(false), diff --git a/src/preferences/menu/MenuWindow.cpp b/src/preferences/menu/MenuWindow.cpp index 0e0322d10d..da35efe867 100644 --- a/src/preferences/menu/MenuWindow.cpp +++ b/src/preferences/menu/MenuWindow.cpp @@ -1,5 +1,6 @@ #include "MenuApp.h" #include + #include #include int ans; @@ -64,8 +65,8 @@ msg->FindPointer("family", (void**)&family); font_style *style; msg->FindPointer("style", (void**)&style); - info.f_family = *family; - info.f_style = *style; + memcpy(info.f_family, family, sizeof(info.f_family)); + memcpy(info.f_style, style, sizeof(info.f_style)); set_menu_info(&info); Update(); break; diff --git a/src/preferences/mouse/MouseWindow.cpp b/src/preferences/mouse/MouseWindow.cpp index 22015e3195..c2d30c9be4 100644 --- a/src/preferences/mouse/MouseWindow.cpp +++ b/src/preferences/mouse/MouseWindow.cpp @@ -32,8 +32,8 @@ #include "SettingsView.h" -MouseWindow::MouseWindow(BRect rect) - : BWindow(rect, "Mouse", B_TITLED_WINDOW, +MouseWindow::MouseWindow(BRect _rect) + : BWindow(_rect, "Mouse", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS) { BView *view = new BView(Bounds(), "view", B_FOLLOW_ALL, 0); diff --git a/src/preferences/screensaver/Jamfile b/src/preferences/screensaver/Jamfile index 38210a796a..fcd49d6d5b 100644 --- a/src/preferences/screensaver/Jamfile +++ b/src/preferences/screensaver/Jamfile @@ -12,7 +12,7 @@ Preference ScreenSaver : PreviewView.cpp MouseAreaView.cpp ScreenSaver.cpp - : libtracker.so libscreensaver.so libbe.so libstdc++.r4.so + : libtracker.so libscreensaver.so be $(TARGET_LIBSTDC++) : ScreenSaver.rdef ; diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp index 97a1897cda..4b2671c3c4 100644 --- a/src/preferences/screensaver/ScreenSaverWindow.cpp +++ b/src/preferences/screensaver/ScreenSaverWindow.cpp @@ -75,7 +75,7 @@ private: }; -CustomTab::CustomTab(ScreenSaverWin *win, BView *view = NULL) +CustomTab::CustomTab(ScreenSaverWin *win, BView *view) : BTab(view), fWin(win) { diff --git a/src/preferences/time/CalendarView.cpp b/src/preferences/time/CalendarView.cpp index 653db197e2..9f9efa086e 100644 --- a/src/preferences/time/CalendarView.cpp +++ b/src/preferences/time/CalendarView.cpp @@ -203,7 +203,7 @@ TDay::SetTo(BRect frame, int day) void -TDay::SetTo(int day, bool selected = false) +TDay::SetTo(int day, bool selected) { f_day = day; SetValue(selected); diff --git a/src/preferences/time/DateTimeEdit.cpp b/src/preferences/time/DateTimeEdit.cpp index 5d19f64b6f..5f1a625c55 100644 --- a/src/preferences/time/DateTimeEdit.cpp +++ b/src/preferences/time/DateTimeEdit.cpp @@ -8,7 +8,7 @@ #define YEAR_DELTA_MIN 64 -TDateTimeSection::TDateTimeSection(BRect frame, uint32 data = 0) +TDateTimeSection::TDateTimeSection(BRect frame, uint32 data) : TSection(frame) , f_data(data) { diff --git a/src/preferences/virtualmemory/Jamfile b/src/preferences/virtualmemory/Jamfile index aaa4ae849d..bcae72da68 100644 --- a/src/preferences/virtualmemory/Jamfile +++ b/src/preferences/virtualmemory/Jamfile @@ -10,7 +10,7 @@ Preference VirtualMemory : Settings.cpp $(DRIVER_SETTINGS) - : libbe.so libstdc++.r4.so libroot.so + : be $(TARGET_LIBSTDC++) : VirtualMemory.rdef ; diff --git a/src/preferences/virtualmemory/Settings.cpp b/src/preferences/virtualmemory/Settings.cpp index 8e3ce27411..3fe9371633 100644 --- a/src/preferences/virtualmemory/Settings.cpp +++ b/src/preferences/virtualmemory/Settings.cpp @@ -16,6 +16,7 @@ #include #include +#include static const char* kWindowSettingsFile = "VM_data"; diff --git a/src/servers/app/BitmapManager.cpp b/src/servers/app/BitmapManager.cpp index c092772134..cfbcf029e7 100644 --- a/src/servers/app/BitmapManager.cpp +++ b/src/servers/app/BitmapManager.cpp @@ -20,6 +20,7 @@ #include "ServerBitmap.h" #include "BitmapManager.h" +using std::nothrow; //! The bitmap allocator for the server. Memory is allocated/freed by the AppServer class BitmapManager *gBitmapManager = NULL; diff --git a/src/servers/app/FontManager.cpp b/src/servers/app/FontManager.cpp index a90d9df410..02a1bde28f 100644 --- a/src/servers/app/FontManager.cpp +++ b/src/servers/app/FontManager.cpp @@ -27,6 +27,7 @@ #include +using std::nothrow; //#define TRACE_WATCHING #ifdef TRACE_WATCHING diff --git a/src/servers/app/HashTable.cpp b/src/servers/app/HashTable.cpp index 2d0ee7cea1..74b6ab90ad 100644 --- a/src/servers/app/HashTable.cpp +++ b/src/servers/app/HashTable.cpp @@ -15,6 +15,7 @@ //#include #include +using std::nothrow; struct HashTable::entry { entry* next; diff --git a/src/servers/app/MessageLooper.cpp b/src/servers/app/MessageLooper.cpp index 576a547752..5671c56b71 100644 --- a/src/servers/app/MessageLooper.cpp +++ b/src/servers/app/MessageLooper.cpp @@ -11,6 +11,7 @@ #include #include +#include MessageLooper::MessageLooper(const char* name) diff --git a/src/servers/app/RAMLinkMsgReader.cpp b/src/servers/app/RAMLinkMsgReader.cpp index d8f361e538..f25a5ae50d 100644 --- a/src/servers/app/RAMLinkMsgReader.cpp +++ b/src/servers/app/RAMLinkMsgReader.cpp @@ -1,5 +1,6 @@ #include "RAMLinkMsgReader.h" -#include +#include +#include RAMLinkMsgReader::RAMLinkMsgReader(int8 *buffer) : BPrivate::LinkReceiver(-1) diff --git a/src/servers/app/ScreenManager.cpp b/src/servers/app/ScreenManager.cpp index ac588d6fcf..5d08bc6702 100644 --- a/src/servers/app/ScreenManager.cpp +++ b/src/servers/app/ScreenManager.cpp @@ -18,6 +18,8 @@ #include +using std::nothrow; + #ifdef __HAIKU__ # define USE_ACCELERANT 1 diff --git a/src/servers/app/ServerBitmap.cpp b/src/servers/app/ServerBitmap.cpp index 9e6cbf9d1e..160f8c9dfa 100644 --- a/src/servers/app/ServerBitmap.cpp +++ b/src/servers/app/ServerBitmap.cpp @@ -26,8 +26,12 @@ //------------------------------------------------------------------------------ #include +#include + #include "ServerBitmap.h" +using std::nothrow; + /*! \brief Constructor called by the BitmapManager (only). \param rect Size of the bitmap. diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp index aff8fff304..adf09969b1 100644 --- a/src/servers/app/ServerWindow.cpp +++ b/src/servers/app/ServerWindow.cpp @@ -60,6 +60,8 @@ #include "clipping.h" +using std::nothrow; + //#define DEBUG_SERVERWINDOW //#define DEBUG_SERVERWINDOW_GRAPHICS diff --git a/src/servers/app/SystemPalette.cpp b/src/servers/app/SystemPalette.cpp index 1946021879..8886c9fac3 100644 --- a/src/servers/app/SystemPalette.cpp +++ b/src/servers/app/SystemPalette.cpp @@ -26,6 +26,7 @@ // //------------------------------------------------------------------------------ #include +#include #include diff --git a/src/servers/app/VirtualScreen.cpp b/src/servers/app/VirtualScreen.cpp index 3bafb2c693..27d90ea3f5 100644 --- a/src/servers/app/VirtualScreen.cpp +++ b/src/servers/app/VirtualScreen.cpp @@ -14,6 +14,8 @@ #include +using std::nothrow; + VirtualScreen::VirtualScreen() : diff --git a/src/servers/app/drawing/AccelerantHWInterface.cpp b/src/servers/app/drawing/AccelerantHWInterface.cpp index 8c63f188c8..d69d1bd2b6 100644 --- a/src/servers/app/drawing/AccelerantHWInterface.cpp +++ b/src/servers/app/drawing/AccelerantHWInterface.cpp @@ -35,6 +35,8 @@ #include "AccelerantBuffer.h" #include "MallocBuffer.h" +using std::nothrow; + #ifdef DEBUG_DRIVER_MODULE # include @@ -571,7 +573,7 @@ AccelerantHWInterface::RetraceSemaphore() // WaitForRetrace status_t -AccelerantHWInterface::WaitForRetrace(bigtime_t timeout = B_INFINITE_TIMEOUT) +AccelerantHWInterface::WaitForRetrace(bigtime_t timeout) { AutoReadLocker _(this); diff --git a/src/servers/app/drawing/BitmapHWInterface.cpp b/src/servers/app/drawing/BitmapHWInterface.cpp index dab070db44..4aa1548591 100644 --- a/src/servers/app/drawing/BitmapHWInterface.cpp +++ b/src/servers/app/drawing/BitmapHWInterface.cpp @@ -22,6 +22,8 @@ #include "BitmapHWInterface.h" +using std::nothrow; + // constructor BitmapHWInterface::BitmapHWInterface(ServerBitmap* bitmap) : HWInterface(), @@ -145,7 +147,7 @@ BitmapHWInterface::RetraceSemaphore() // WaitForRetrace status_t -BitmapHWInterface::WaitForRetrace(bigtime_t timeout = B_INFINITE_TIMEOUT) +BitmapHWInterface::WaitForRetrace(bigtime_t timeout) { return B_UNSUPPORTED; } diff --git a/src/servers/debug/DebugServer.cpp b/src/servers/debug/DebugServer.cpp index e83ba2932e..b6357099ed 100644 --- a/src/servers/debug/DebugServer.cpp +++ b/src/servers/debug/DebugServer.cpp @@ -32,6 +32,8 @@ # define TRACE(x) ; #endif +using std::map; +using std::nothrow; static const char *kSignature = "application/x-vnd.haiku-debug-server"; diff --git a/src/servers/media/MMediaFilesManager.cpp b/src/servers/media/MMediaFilesManager.cpp index 919a64e766..e5a9d3c267 100644 --- a/src/servers/media/MMediaFilesManager.cpp +++ b/src/servers/media/MMediaFilesManager.cpp @@ -225,7 +225,7 @@ MMediaFilesManager::RewindTypes(BString ***types, int32 *count) BString *type; *count = fRegistryMap->CountItems(); - *types = new (BString*)[*count]; + *types = new BString*[*count]; int32 i=0; for (fRegistryMap->Rewind(); i<*count && fRegistryMap->GetNext(&map); i++) { @@ -255,7 +255,7 @@ MMediaFilesManager::RewindRefs(const char* type, BString ***items, int32 *count) return B_OK; *count = map->CountItems(); - *items = new (BString*)[*count]; + *items = new BString*[*count]; int32 i=0; for (map->Rewind(); i<*count && map->GetNext(&ref); i++) { diff --git a/src/servers/registrar/AppInfoList.cpp b/src/servers/registrar/AppInfoList.cpp index 4386a3bde4..dadf508c04 100644 --- a/src/servers/registrar/AppInfoList.cpp +++ b/src/servers/registrar/AppInfoList.cpp @@ -194,7 +194,7 @@ AppInfoList::Sort(int (*cmpFunc)(const RosterAppInfo *, const RosterAppInfo *)) int32 count = CountInfos(); if (count > 1) { RosterAppInfo **infos = (RosterAppInfo **)fInfos.Items(); - sort(infos, infos + count, cmpFunc); + std::sort(infos, infos + count, cmpFunc); } } diff --git a/src/servers/registrar/ClipboardHandler.cpp b/src/servers/registrar/ClipboardHandler.cpp index e188238c3d..a1efe18934 100644 --- a/src/servers/registrar/ClipboardHandler.cpp +++ b/src/servers/registrar/ClipboardHandler.cpp @@ -9,6 +9,8 @@ #include "Clipboard.h" #include "ClipboardHandler.h" +using std::map; +using std::string; using namespace BPrivate; /*! diff --git a/src/servers/registrar/MessageDeliverer.cpp b/src/servers/registrar/MessageDeliverer.cpp index d9461a0ef3..66cc7dc0f5 100644 --- a/src/servers/registrar/MessageDeliverer.cpp +++ b/src/servers/registrar/MessageDeliverer.cpp @@ -22,6 +22,10 @@ #include "MessageDeliverer.h" #include "Referenceable.h" +using std::map; +using std::nothrow; +using std::set; + // sDeliverer -- the singleton instance MessageDeliverer *MessageDeliverer::sDeliverer = NULL; diff --git a/src/servers/registrar/MessageRunnerManager.cpp b/src/servers/registrar/MessageRunnerManager.cpp index 7f8cd80751..18e5dd9d28 100644 --- a/src/servers/registrar/MessageRunnerManager.cpp +++ b/src/servers/registrar/MessageRunnerManager.cpp @@ -40,6 +40,9 @@ #include "MessageDeliverer.h" #include "MessageRunnerManager.h" +using std::max; +using std::nothrow; + /*! \class MessageRunnerManager \brief Manages the registrar side "shadows" of BMessageRunners. diff --git a/src/servers/registrar/MessagingService.cpp b/src/servers/registrar/MessagingService.cpp index 4bda6cf210..eaf7f412b4 100644 --- a/src/servers/registrar/MessagingService.cpp +++ b/src/servers/registrar/MessagingService.cpp @@ -16,6 +16,9 @@ #include "MessageDeliverer.h" #include "MessagingService.h" +using std::map; +using std::nothrow; + // sService -- the singleton instance MessagingService *MessagingService::sService = NULL; diff --git a/src/servers/registrar/Registrar.cpp b/src/servers/registrar/Registrar.cpp index e5e8e938a9..7d5a3cccdd 100644 --- a/src/servers/registrar/Registrar.cpp +++ b/src/servers/registrar/Registrar.cpp @@ -29,6 +29,7 @@ Glues the registrar services together and dispatches the roster messages. */ +using std::nothrow; using namespace BPrivate; //! Name of the event queue. diff --git a/src/servers/registrar/RosterAppInfo.cpp b/src/servers/registrar/RosterAppInfo.cpp index b6b0d5fb9c..354b060326 100644 --- a/src/servers/registrar/RosterAppInfo.cpp +++ b/src/servers/registrar/RosterAppInfo.cpp @@ -30,6 +30,8 @@ #include "RosterAppInfo.h" +using std::nothrow; + // constructor RosterAppInfo::RosterAppInfo() : app_info(), diff --git a/src/servers/registrar/ShutdownProcess.cpp b/src/servers/registrar/ShutdownProcess.cpp index 2597c31737..0520888d82 100644 --- a/src/servers/registrar/ShutdownProcess.cpp +++ b/src/servers/registrar/ShutdownProcess.cpp @@ -41,6 +41,7 @@ #include "ShutdownProcess.h" #include "TRoster.h" +using std::nothrow; using namespace BPrivate; // The time span a non-background application has after the quit message has diff --git a/src/servers/registrar/ShutdownProcess.h b/src/servers/registrar/ShutdownProcess.h index 5394a1782c..c20aedc4c7 100644 --- a/src/servers/registrar/ShutdownProcess.h +++ b/src/servers/registrar/ShutdownProcess.h @@ -14,6 +14,11 @@ #include "AppInfoList.h" #include "EventMaskWatcher.h" +#if __GNUC__ >= 4 +using __gnu_cxx::hash_set; +#endif + + class EventQueue; class TRoster; diff --git a/src/servers/registrar/TRoster.cpp b/src/servers/registrar/TRoster.cpp index 1da5bf1c28..7aa021d1cd 100644 --- a/src/servers/registrar/TRoster.cpp +++ b/src/servers/registrar/TRoster.cpp @@ -33,6 +33,7 @@ #include "RosterSettingsCharStream.h" #include "TRoster.h" +using std::nothrow; using namespace BPrivate; //------------------------------------------------------------------------------ diff --git a/src/servers/registrar/TRoster.h b/src/servers/registrar/TRoster.h index 7e3e8f5521..6e2944595f 100644 --- a/src/servers/registrar/TRoster.h +++ b/src/servers/registrar/TRoster.h @@ -39,6 +39,12 @@ #include "RecentEntries.h" #include "WatchingService.h" +#if __GNUC__ >= 4 +using __gnu_cxx::hash_set; +#endif + +using std::map; + class BMessage; class WatchingService; diff --git a/src/system/boot/platform/bios_ia32/smp.cpp b/src/system/boot/platform/bios_ia32/smp.cpp index 7aa217ee75..909ffdc9d1 100644 --- a/src/system/boot/platform/bios_ia32/smp.cpp +++ b/src/system/boot/platform/bios_ia32/smp.cpp @@ -400,7 +400,7 @@ smp_boot_other_cpus(void) trampolineStack = 0x9e000; // copy the trampoline code over - memcpy((char *)trampolineCode, &smp_trampoline, + memcpy((char *)trampolineCode, (const void*)&smp_trampoline, (uint32)&smp_trampoline_end - (uint32)&smp_trampoline); // boot the cpus diff --git a/src/system/kernel/arch/x86/arch_vm_translation_map.c b/src/system/kernel/arch/x86/arch_vm_translation_map.c index fd71da6250..35b4f16670 100644 --- a/src/system/kernel/arch/x86/arch_vm_translation_map.c +++ b/src/system/kernel/arch/x86/arch_vm_translation_map.c @@ -812,8 +812,8 @@ arch_vm_translation_map_init_map(vm_translation_map *map, bool kernel) } else { // kernel // we already know the kernel pgdir mapping - (addr_t)map->arch_data->pgdir_virt = kernel_pgdir_virt; - (addr_t)map->arch_data->pgdir_phys = kernel_pgdir_phys; + map->arch_data->pgdir_virt = kernel_pgdir_virt; + map->arch_data->pgdir_phys = kernel_pgdir_phys; } // zero out the bottom portion of the new pgdir diff --git a/src/system/kernel/timer.c b/src/system/kernel/timer.c index 14d3a8ce2b..a9ff23fa57 100644 --- a/src/system/kernel/timer.c +++ b/src/system/kernel/timer.c @@ -53,10 +53,10 @@ add_event_to_list(timer *event, timer * volatile *list) } if (last != NULL) { - (timer *)event->entry.next = (timer *)last->entry.next; - (timer *)last->entry.next = event; + event->entry.next = last->entry.next; + last->entry.next = (qent*)event; } else { - (timer *)event->entry.next = next; + event->entry.next = (qent*)next; *list = event; } } @@ -182,7 +182,7 @@ _local_timer_cancel_event(int cpu, timer *event) if (current == sEvents[cpu]) sEvents[cpu] = (timer *)current->entry.next; else - (timer *)last->entry.next = (timer *)current->entry.next; + last->entry.next = current->entry.next; current->entry.next = NULL; // break out of the whole thing break; @@ -234,7 +234,7 @@ cancel_timer(timer *event) if (current == sEvents[cpu]) sEvents[cpu] = (timer *)current->entry.next; else - (timer *)last->entry.next = (timer *)current->entry.next; + last->entry.next = current->entry.next; current->entry.next = NULL; // break out of the whole thing diff --git a/src/system/kernel/util/kernel_cpp.cpp b/src/system/kernel/util/kernel_cpp.cpp index bcd4fe292f..f06c561f9f 100644 --- a/src/system/kernel/util/kernel_cpp.cpp +++ b/src/system/kernel/util/kernel_cpp.cpp @@ -54,6 +54,34 @@ fprintf(FILE *f, const char *format, ...) return 0; } +#if __GNUC__ >= 3 + +extern "C" +size_t +fwrite(const void *buffer, size_t size, size_t numItems, FILE *stream) +{ + dprintf("%.*s", int(size * numItems), (char*)buffer); + return 0; +} + +extern "C" +int +fputs(const char *string, FILE *stream) +{ + dprintf("%s", string); + return 0; +} + +extern "C" +int +fputc(int c, FILE *stream) +{ + dprintf("%c", c); + return 0; +} + +#endif // __GNUC__ >= 3 + extern "C" void abort() diff --git a/src/system/libroot/os/debug.c b/src/system/libroot/os/debug.c index 9d076395d0..0fb80db8f3 100644 --- a/src/system/libroot/os/debug.c +++ b/src/system/libroot/os/debug.c @@ -62,7 +62,7 @@ debugger(const char *message) } -const int +int disable_debugger(int state) { return _kern_disable_debugger(state); diff --git a/src/tests/apps/miniterminal/Arguments.cpp b/src/tests/apps/miniterminal/Arguments.cpp index d7a562df26..1f2754d422 100644 --- a/src/tests/apps/miniterminal/Arguments.cpp +++ b/src/tests/apps/miniterminal/Arguments.cpp @@ -4,6 +4,8 @@ */ #include +#include +#include #include "Arguments.h" diff --git a/src/tools/gensyscalls/Jamfile b/src/tools/gensyscalls/Jamfile index 88ff9239b6..a220446d73 100644 --- a/src/tools/gensyscalls/Jamfile +++ b/src/tools/gensyscalls/Jamfile @@ -124,8 +124,9 @@ rule PreprocessSyscalls DEFINES on $(<) += $(HAIKU_DEFINES) GEN_SYSCALL_INFOS_PROCESSING ; CCFLAGS on $(<) += $(HAIKU_CCFLAGS) $(SUBDIRCCFLAGS) $(OPTIM) ; - CCHDRS on $(<) = [ FIncludes $(headers) ] - $(HDRS_INCLUDES_SEPARATOR) [ FSysIncludes $(sysHeaders) ] ; + CCHDRS on $(<) = [ FIncludes $(headers) : $(HOST_LOCAL_INCLUDES_OPTION) ] + $(HOST_INCLUDES_SEPARATOR) + [ FSysIncludes $(sysHeaders) : $(HOST_SYSTEM_INCLUDES_OPTION) ] ; CCDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ; } @@ -139,5 +140,7 @@ PreprocessSyscalls $(syscallsHeaderPP) : $(syscallsHeader) ; # compile the syscall infos source file +# TODO: Clean this mess up! SYSHDRS on $(syscallInfos:S=$(SUFOBJ)) = $(HAIKU_HDRS) ; Object $(syscallInfos:S=$(SUFOBJ)) : $(syscallInfos) ; +CCFLAGS on $(syscallInfos:S=$(SUFOBJ)) += -nostdinc ;