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

Unified Diff: mojo/services/view_manager/view_manager_connection.h

Issue 271363002: Fix compile error on Win64 due to C++ warning 4275 occurring because an exported class ViewManagerC… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed NON_EXPORTED_BASE Created 6 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/view_manager_connection.h
diff --git a/mojo/services/view_manager/view_manager_connection.h b/mojo/services/view_manager/view_manager_connection.h
index 6b09498fde4ad69a3c4c46c8a8d7ae37512552e1..88f63f6ceb0e1de4a54a72561ca95e6314bfa96f 100644
--- a/mojo/services/view_manager/view_manager_connection.h
+++ b/mojo/services/view_manager/view_manager_connection.h
@@ -23,10 +23,16 @@ class Node;
class RootNodeManager;
class View;
+#if defined(OS_WIN)
+// Equivalent of NON_EXPORTED_BASE which does not work with the template snafu
+// below.
+#pragma warning( push)
+#pragma warning( disable : 4275)
+#endif
cpu_(ooo_6.6-7.5) 2014/05/10 02:42:14 spaces in warnings should be consistent.
ananta 2014/05/10 02:44:25 Removed the spaces.
+
// Manages a connection from the client.
class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
- : public ServiceConnection<NON_EXPORTED_BASE(IViewManager),
- ViewManagerConnection,
+ : public ServiceConnection<IViewManager, ViewManagerConnection,
RootNodeManager>,
public NodeDelegate {
public:
@@ -128,6 +134,10 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
DISALLOW_COPY_AND_ASSIGN(ViewManagerConnection);
};
+#if defined(OS_WIN)
+#pragma warning( pop )
+#endif
+
} // namespace view_manager
} // namespace services
} // namespace mojo
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698