[haiku-commits] r33453 - haiku/trunk/src/servers/app/drawing

  • From: superstippi@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 6 Oct 2009 11:19:57 +0200 (CEST)

Author: stippi
Date: 2009-10-06 11:19:57 +0200 (Tue, 06 Oct 2009)
New Revision: 33453
Changeset: http://dev.haiku-os.org/changeset/33453/haiku

Modified:
   haiku/trunk/src/servers/app/drawing/DWindowHWInterface.cpp
Log:
GCC4 fixes when compiling the test environment.


Modified: haiku/trunk/src/servers/app/drawing/DWindowHWInterface.cpp
===================================================================
--- haiku/trunk/src/servers/app/drawing/DWindowHWInterface.cpp  2009-10-06 
09:18:47 UTC (rev 33452)
+++ haiku/trunk/src/servers/app/drawing/DWindowHWInterface.cpp  2009-10-06 
09:19:57 UTC (rev 33453)
@@ -333,9 +333,9 @@
        fAccMoveCursor(NULL),
        fAccShowCursor(NULL),
 
-       fRectParams(new (nothrow) fill_rect_params[kDefaultParamsCount]),
+       fRectParams(new (std::nothrow) fill_rect_params[kDefaultParamsCount]),
        fRectParamsCount(kDefaultParamsCount),
-       fBlitParams(new (nothrow) blit_params[kDefaultParamsCount]),
+       fBlitParams(new (std::nothrow) blit_params[kDefaultParamsCount]),
        fBlitParamsCount(kDefaultParamsCount)
 {
        fDisplayMode.virtual_width = 800;
@@ -797,7 +797,7 @@
 //     const uint32 colors[] = {B_CMAP8, B_RGB15, B_RGB16, B_RGB32};
        uint32 count = resolutionCount/* * 4*/;
 
-       display_mode* modes = new(nothrow) display_mode[count];
+       display_mode* modes = new(std::nothrow) display_mode[count];
        if (modes == NULL)
                return B_NO_MEMORY;
 
@@ -825,7 +825,7 @@
 #else
        // support only a single mode, useful
        // for testing a specific mode
-       display_mode *modes = new(nothrow) display_mode[1];
+       display_mode *modes = new(std::nothrow) display_mode[1];
        modes[0].virtual_width = 800;
        modes[0].virtual_height = 600;
        modes[0].space = B_BRGB32;
@@ -874,7 +874,7 @@
 
 
 status_t
-DWindowHWInterface::WaitForRetrace(bigtime_t timeout = B_INFINITE_TIMEOUT)
+DWindowHWInterface::WaitForRetrace(bigtime_t timeout)
 {
        // Locking shouldn't be necessary here - R5 should handle this for us. 
:)
        BScreen screen;


Other related posts:

  • » [haiku-commits] r33453 - haiku/trunk/src/servers/app/drawing - superstippi