| author | simon <simon> | 2003-02-03 11:05:53 (UTC) |
|---|---|---|
| committer | simon <simon> | 2003-02-03 11:05:53 (UTC) |
| commit | 0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6 (patch) (side-by-side diff) | |
| tree | a1679fb241c3a37041c550fb9464dd2c4a755eed | |
| parent | f2e80c39e5861f12e1c08e548ebff33ecb0d6ea6 (diff) | |
| download | opie-0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6.zip opie-0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6.tar.gz opie-0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6.tar.bz2 | |
- link in libstdc++
- removed std::vector custom allocator hack for gcc2. we always pull in
libstdc++ now.
| -rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 17 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/opieplayer2.pro | 2 |
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 @@ -32,17 +32,6 @@ #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 @@ -65,13 +54,7 @@ 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, simpleAndStupidAllocator> > ButtonVector; -#else typedef std::vector<Button> ButtonVector; -#endif struct SkinButtonInfo { 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 @@ -17,7 +17,7 @@ SOURCES = main.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 |