summaryrefslogtreecommitdiff
authorsimon <simon>2003-02-03 11:05:53 (UTC)
committer simon <simon>2003-02-03 11:05:53 (UTC)
commit0b51d46117f7b6f7fd8e4ee614cbf6265b4e7bf6 (patch) (unidiff)
treea1679fb241c3a37041c550fb9464dd2c4a755eed
parentf2e80c39e5861f12e1c08e548ebff33ecb0d6ea6 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h17
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro2
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
@@ -34,13 +34,2 @@
34 34
35namespace
36{
37 struct simpleAndStupidAllocator
38 {
39 static void *allocate( size_t amount )
40 { return ::operator new( amount ); }
41 static void deallocate( void *p, size_t )
42 { ::operator delete( p ); }
43 };
44}
45
46class Skin; 35class Skin;
@@ -67,9 +56,3 @@ public:
67 }; 56 };
68#if defined( _CC_GNU_ )
69 // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because
70 // in the BAD_ALLOC macro it uses std::cerr and friends :-(
71 typedef std::vector<Button, std::__allocator<Button, simpleAndStupidAllocator> > ButtonVector;
72#else
73 typedef std::vector<Button> ButtonVector; 57 typedef std::vector<Button> ButtonVector;
74#endif
75 58
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
@@ -19,3 +19,3 @@ INCLUDEPATH += $(OPIEDIR)/include
19DEPENDPATH += $(OPIEDIR)/include 19DEPENDPATH += $(OPIEDIR)/include
20LIBS += -lqpe -lpthread -lopie -lxine 20LIBS += -lqpe -lpthread -lopie -lxine -lstdc++
21MOC_DIR = qpeobj 21MOC_DIR = qpeobj