From 8bf05369dcdf93a712607aab6dacf407dcce5142 Mon Sep 17 00:00:00 2001
From: simon <simon>
Date: Mon, 09 Dec 2002 22:26:11 +0000
Subject: - work around gcc2's stupid STL that requires libstdc++ in the default

  allocator
---
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 3b3a263..df03b22 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -30,6 +30,7 @@
 #include "playlistwidget.h"
 
 #include <vector>
+#include <memory>
 
 class MediaWidget : public QWidget
 {
@@ -51,7 +52,13 @@ public:
         QPixmap pixUp;
         QPixmap pixDown;
     };
+#if defined( _CC_GNU_ )
+    // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because
+    // in the BAD_ALLOC macro it uses std::cerr and friends :-(
+    typedef std::vector<Button, std::__allocator<Button, std::__new_alloc> > ButtonVector;
+#else
     typedef std::vector<Button> ButtonVector;
+#endif
 
     struct SkinButtonInfo
     {
@@ -60,9 +67,6 @@ public:
         ButtonType type;
     };
 
-    typedef std::vector<QBitmap> MaskVector;
-    typedef std::vector<QPixmap> PixmapVector;
-
     MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
     virtual ~MediaWidget();
 
--
cgit v0.9.0.2