Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: views/controls/table/table_view_unittest.cc

Issue 6676030: WinDDK ATL and MSVC express compatability (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/controls/table/table_view_unittest.cc
===================================================================
--- views/controls/table/table_view_unittest.cc (revision 78148)
+++ views/controls/table/table_view_unittest.cc (working copy)
@@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#ifdef COMPILER_MSVCEXPRESS
+#include <atlbase.h>
+#include <atlwin.h> // Avoid WinDDK intsafe.h/XINTXX_MIN/MAX conflicts
+#endif
#include <vector>
#include "base/compiler_specific.h"
@@ -21,7 +25,7 @@
#endif
using ui::TableModel;
-using ui::TableModelObserver; // TODO(beng): remove these
+using ui::TableModelObserver; // TODO(beng): remove these
// Put the tests in the views namespace to make it easier to declare them as
// friend classes.

Powered by Google App Engine
This is Rietveld 408576698