Fixed gcc 4(.1.2) build problems.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20320 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/app/MessageUtils.h

@@ -112,14 +112,6 @@ private:
 };
 
 
-template<class T>
-inline status_t
-read_helper(BDataIO *stream, T &data)
-{
-	return normalize_err(stream->Read((void *)&data, sizeof(T)));
-}
-
-
 template<>
 inline void
 byte_swap(double &data)

headers/private/storage/DiskDevice.h

@@ -40,8 +40,8 @@ private:
 	friend class BDiskDeviceList;
 	friend class BDiskDeviceRoster;
 
-	BDiskDevice::BDiskDevice(const BDiskDevice &);
-	BDiskDevice &BDiskDevice::operator=(const BDiskDevice &);
+	BDiskDevice(const BDiskDevice &);
+	BDiskDevice &operator=(const BDiskDevice &);
 
 	static status_t _GetData(partition_id id, bool deviceOnly, bool shadow,
 							 size_t neededSize, user_disk_device_data **data);

src/add-ons/media/plugins/ogg/OggSeekable.cpp

@@ -4,6 +4,7 @@
 #include "OggVorbisSeekable.h"
 #include "OggFormats.h"
 #include <Autolock.h>
+#include <assert.h>
 #include <stdio.h>
 
 #define TRACE_THIS 1

src/add-ons/translators/bmp/BMPTranslator.cpp

@@ -694,6 +694,7 @@ BPositionIO *outDestination, color_space fromspace, MSInfoHeader &msheader)
 					break;
 				
 				case B_CMAP8:
+				{
 					bitspixel = bitsRowData + (i * bitsBytesPerPixel);
 					bmppixel = bmpRowData + (i * 3);
 					rgb_color c = pmap->color_list[bitspixel[0]];
@@ -701,6 +702,7 @@ BPositionIO *outDestination, color_space fromspace, MSInfoHeader &msheader)
 					bmppixel[1] = c.green;
 					bmppixel[2] = c.red;
 					break;
+				}
 					
 				case B_GRAY8:
 					bitspixel = bitsRowData + (i * bitsBytesPerPixel);

src/apps/cortex/DiagramView/DiagramItem.h

@@ -28,6 +28,8 @@ class DiagramItemGroup;
 class DiagramView;
 class DiagramBox;
 
+int compareSelectionTime(const void *lValue, const void *rValue);
+
 class DiagramItem
 {
 	friend class DiagramItemGroup;

src/apps/cortex/DormantNodeView/DormantNodeListItem.h

@@ -25,6 +25,10 @@ __BEGIN_CORTEX_NAMESPACE
 class DormantNodeView;
 class MediaIcon;
 
+int compareName(const void *lValue, const void *rValue);
+int compareAddOnID(const void *lValue, const void *rValue);
+
+
 class DormantNodeListItem :
 	public	BListItem {
 	typedef	BListItem _inherited;

src/apps/cortex/MediaRoutingView/MediaJack.h

@@ -24,6 +24,8 @@ class BBitmap;
 #include "cortex_defs.h"
 __BEGIN_CORTEX_NAMESPACE
 
+int compareTypeAndID(const void *lValue, const void *rValue);
+
 class MediaJack : public DiagramEndPoint
 {
 

src/apps/cortex/MediaRoutingView/MediaNodePanel.h

@@ -22,6 +22,8 @@
 #include "cortex_defs.h"
 __BEGIN_CORTEX_NAMESPACE
 
+int compareID(const void *lValue, const void *rValue);
+
 class MediaIcon;
 class NodeRef;
 

src/kits/app/Message.cpp

@@ -30,6 +30,7 @@
 #include <Rect.h>
 #include <String.h>
 
+#include <assert.h>
 #include <ctype.h>
 #include <malloc.h>
 #include <stdio.h>

src/kits/interface/qoca/QcLinEqSolver.hh

@@ -172,7 +172,7 @@ protected:
   	void GetVariableSet(vector<QcFloat> &vars)
   		{ fSystem.GetVariableSet(vars); }
 
-	virtual void QcLinEqSolver::Print(ostream &os) const;
+	virtual void Print(ostream &os) const;
 };
 
 inline QcLinEqSolver::QcLinEqSolver()

src/kits/mail/MailProtocol.cpp

@@ -58,6 +58,7 @@ class MessageDeletion : public BMailChainCallback {
 		BEntry *entry;
 };
 
+} // unnamed namspace
 
 inline void
 BMailProtocol::error_alert(const char *process, status_t error)
@@ -73,6 +74,8 @@ BMailProtocol::error_alert(const char *process, status_t error)
 }
 
 
+namespace {
+
 class DeleteHandler : public BHandler {
 	public:
 		DeleteHandler(BMailProtocol *a)
@@ -150,6 +153,8 @@ class TrashMonitor : public BHandler {
 		int32 id;
 };
 
+} // unnamed namspace
+
 BMailProtocol::BMailProtocol(BMessage *settings, BMailChainRunner *run)
 	: BMailFilter(settings),
 	runner(run), trash_monitor(NULL), uids_on_disk(NULL)
@@ -374,5 +379,3 @@ MessageDeletion::Callback(status_t result)
 	if ((always && strcmp(B_MAIL_TYPE,type) == 0) || result == B_MAIL_DISCARD)
 		us->DeleteMessage(message_id);
 }
-
-}

src/kits/mail/ProtocolConfigView.cpp

@@ -84,6 +84,8 @@ float FindWidestLabel(BView *view)
 	return width;
 }
 
+} // unnamed namspace
+
 
 //----------------Real code----------------------
 BMailProtocolConfigView::BMailProtocolConfigView(uint32 options_mask) : BView (BRect(0,0,100,20), "protocol_config_view", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW) {
@@ -326,5 +328,3 @@ void BMailProtocolConfigView::GetPreferredSize(float *width, float *height) {
 	*width = minWidth + 10;
 	*height = (CountChildren() * gItemHeight) + 5;
 }
-
-}	// namespace

src/kits/mail/RemoteStorageProtocol.cpp

@@ -285,6 +285,8 @@ GetSubFolders(BDirectory *of, BStringList *folders, const char *prepend)
 	}
 }
 
+} // unnamed namspace
+
 
 BRemoteMailStorageProtocol::BRemoteMailStorageProtocol(BMessage *settings,
 	BMailChainRunner *runner)
@@ -301,8 +303,6 @@ BRemoteMailStorageProtocol::~BRemoteMailStorageProtocol()
 	delete handler;
 }
 
-}	// empty namespace
-
 
 //----BMailProtocol stuff
 

src/kits/tracker/DesktopPoseView.h

@@ -43,6 +43,8 @@ All rights reserved.
 
 namespace BPrivate {
 
+bool ShouldShowDesktopPose(dev_t device, const Model *model, const PoseInfo *);
+
 class DesktopPoseView : public BPoseView {
 	// overrides BPoseView to add desktop-view specific code
 public:

src/preferences/screen/MonitorView.h

@@ -28,7 +28,7 @@ class MonitorView : public BView {
 		void SetResolution(int32 width, int32 height);
 
 	private:
-		BRect MonitorView::MonitorBounds();
+		BRect MonitorBounds();
 
 		rgb_color	fDesktopColor;
 		int32		fWidth;