- link in libstdc++

- removed std::vector custom allocator hack for gcc2. we always pull in
  libstdc++ now.

2 files changed, 1 insertions, 18 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 45c46ea..8c3a467 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -29,23 +29,12 @@
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 #include <vector>
 #include <memory>
 
-namespace
-{
-    struct simpleAndStupidAllocator
-    {
-        static void *allocate( size_t amount )
-        { return ::operator new( amount ); }
-        static void deallocate( void *p, size_t )
-        { ::operator delete( p ); }
-    };
-}
-
 class Skin;
 
 class MediaWidget : public QWidget
 {
     Q_OBJECT
 public:
@@ -62,19 +51,13 @@ public:
         bool isDown : 1;
 
         QBitmap mask;
         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, simpleAndStupidAllocator> > ButtonVector;
-#else
     typedef std::vector<Button> ButtonVector;
-#endif
 
     struct SkinButtonInfo
     {
         Command command;
         const char *fileName;
         ButtonType type;
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 44af25f..a739692 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -14,13 +14,13 @@ SOURCES   = main.cpp \
             alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \
 	    threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
 	    skin.cpp
 TARGET    = opieplayer2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
-LIBS        += -lqpe -lpthread -lopie -lxine
+LIBS        += -lqpe -lpthread -lopie -lxine -lstdc++
 MOC_DIR   = qpeobj
 OBJECTS_DIR = qpeobj
 
 #INCLUDEPATH += $(OPIEDIR)/include
 #DEPENDPATH  += $(OPIEDIR)/include