commit 6c7c95b41805fb8f8c38f3b555f937ba2bc2576e
author Daniel Erat <derat@chromium.org> Tue Sep 06 22:25:48 2011
committer Daniel Erat <derat@chromium.org> Wed Sep 07 03:28:18 2011
tree 88c5ab30d752ff3e6d74e88625ba5491fe095a56
parent f19b9401ca471509488ea8894a410f7be696d61e

wm: Fix compilation on gcc-4.6.0.

BUG=chromium-os:20071
TEST=built it

Change-Id: Idcadb48c1ebe55073cddcde78d710591f1123709
Reviewed-on: http://gerrit.chromium.org/gerrit/7296
Reviewed-by: asharif <asharif@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>

login/login_controller_test.cc

diff --git a/login/login_controller_test.cc b/login/login_controller_test.cc
index a5e39cd..d4d5f8e 100644
--- a/login/login_controller_test.cc
+++ b/login/login_controller_test.cc
@@ -967,7 +967,7 @@
   xconn_->UnmapWindow(entries_[1].border_xid);
   xconn_->InitUnmapEvent(&event, entries_[1].border_xid);
   wm_->HandleEvent(&event);
-  entries_[1].border_xid = NULL;
+  entries_[1].border_xid = 0;
 
   // Unmap all other windows.
   UnmapLoginEntry(0);

test_lib.h

diff --git a/test_lib.h b/test_lib.h
index 48abead..8e76046 100644
--- a/test_lib.h
+++ b/test_lib.h
@@ -25,6 +25,7 @@
 #include "window_manager/key_bindings.h"
 #include "window_manager/mock_dbus_interface.h"
 #include "window_manager/stacking_manager.h"
+#include "window_manager/window.h"
 #include "window_manager/window_manager.h"
 #include "window_manager/wm_ipc.h"
 #include "window_manager/x11/mock_x_connection.h"

window_manager_test.cc

diff --git a/window_manager_test.cc b/window_manager_test.cc
index 482c7e7..fcf07e4 100644
--- a/window_manager_test.cc
+++ b/window_manager_test.cc
@@ -255,8 +255,8 @@
   EXPECT_EQ(200, info->bounds.y);
   EXPECT_EQ(300, info->bounds.width);
   EXPECT_EQ(400, info->bounds.height);
-  EXPECT_EQ(true, info->mapped);
-  EXPECT_EQ(true, info->override_redirect);
+  EXPECT_TRUE(info->mapped);
+  EXPECT_TRUE(info->override_redirect);
   EXPECT_EQ(event_mask, info->event_mask);
 
   // Move and resize the window.
@@ -265,7 +265,7 @@
   EXPECT_EQ(600, info->bounds.y);
   EXPECT_EQ(700, info->bounds.width);
   EXPECT_EQ(800, info->bounds.height);
-  EXPECT_EQ(true, info->mapped);
+  EXPECT_TRUE(info->mapped);
 }
 
 TEST_F(WindowManagerTest, EventConsumer) {

window_test.cc

diff --git a/window_test.cc b/window_test.cc
index ee51a5e..e955731 100644
--- a/window_test.cc
+++ b/window_test.cc
@@ -89,7 +89,7 @@
   EXPECT_EQ(20, window.client_y());
   EXPECT_EQ(30, window.client_width());
   EXPECT_EQ(40, window.client_height());
-  EXPECT_EQ(false, window.mapped());
+  EXPECT_FALSE(window.mapped());
 
   EXPECT_TRUE(window.MapClient());
   EXPECT_TRUE(info->mapped);