Added fixes for compiling on GCC4.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33250 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-09-23 10:21:58 +00:00
parent 32bf3ca5f8
commit b671e9bbdb
9 changed files with 11 additions and 9 deletions
+1
View File
@@ -146,6 +146,7 @@ Server test_app_server :
z libtestappserver.so libpainter.a be z libtestappserver.so libpainter.a be
libhwinterface.so libhwinterfaceimpl.so libhwinterface.so libhwinterfaceimpl.so
libagg.a libfreetype.so libtextencoding.so libagg.a libfreetype.so libtextencoding.so
$(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
; ;
# install in the test dir # install in the test dir
+1 -1
View File
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
SimpleTest ArchivedView : SimpleTest ArchivedView :
main.cpp main.cpp
: be : be $(TARGET_LIBSUPC++)
: ArchivedView.rdef : ArchivedView.rdef
; ;
+2 -2
View File
@@ -111,7 +111,7 @@ updateRect.PrintToStream();
// Archive // Archive
status_t status_t
TestView::Archive(BMessage* into, bool deep = true) const TestView::Archive(BMessage* into, bool deep) const
{ {
status_t ret = BView::Archive(into, deep); status_t ret = BView::Archive(into, deep);
@@ -160,7 +160,7 @@ show_window(BRect frame, const char* name)
printf("instatiated BView\n"); printf("instatiated BView\n");
} }
} }
if (!view) if (!view)
view = new TestView(window->Bounds(), "test", B_FOLLOW_ALL, B_WILL_DRAW); view = new TestView(window->Bounds(), "test", B_FOLLOW_ALL, B_WILL_DRAW);
+2 -2
View File
@@ -13,9 +13,9 @@ SetSubDirSupportedPlatforms libbe_test ;
SimpleTest TestApp_Clock : SimpleTest TestApp_Clock :
cl_view.cpp cl_view.cpp
cl_wind.cpp cl_wind.cpp
clock.cpp clock.cpp
: be : be $(TARGET_LIBSUPC++)
: Clock.rdef : Clock.rdef
; ;
+1 -1
View File
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
Application StressTest : Application StressTest :
main.cpp main.cpp
: be : be $(TARGET_LIBSTDC++)
; ;
if ( $(TARGET_PLATFORM) = libbe_test ) { if ( $(TARGET_PLATFORM) = libbe_test ) {
@@ -2,6 +2,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <Application.h> #include <Application.h>
#include <MessageRunner.h> #include <MessageRunner.h>
@@ -7,7 +7,7 @@ UsePrivateHeaders interface ;
Application WindowInvalidation : Application WindowInvalidation :
WindowInvalidation.cpp WindowInvalidation.cpp
: be $(TARGET_LIBSUPC++) : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
; ;
if $(TARGET_PLATFORM) = libbe_test { if $(TARGET_PLATFORM) = libbe_test {
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
Application WorkspaceActivated : Application WorkspaceActivated :
WorkspaceActivated.cpp WorkspaceActivated.cpp
: be $(TARGET_LIBSUPC++) : be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
; ;
if $(TARGET_PLATFORM) = libbe_test { if $(TARGET_PLATFORM) = libbe_test {
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
Application workspace_switcher : Application workspace_switcher :
workspace_switcher.cpp workspace_switcher.cpp
: be : be $(TARGET_LIBSTDC++)
; ;
if $(TARGET_PLATFORM) = libbe_test { if $(TARGET_PLATFORM) = libbe_test {