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

Unified Diff: mojo/public/cpp/bindings/lib/macros.h

Issue 1784743003: [mojo-sdk] Remove mojo_ignore_result and move C++ macros.h to bindings internal code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
« no previous file with comments | « mojo/public/cpp/bindings/lib/filter_chain.h ('k') | mojo/public/cpp/bindings/lib/shared_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/bindings/lib/macros.h
diff --git a/mojo/public/cpp/system/macros.h b/mojo/public/cpp/bindings/lib/macros.h
similarity index 75%
rename from mojo/public/cpp/system/macros.h
rename to mojo/public/cpp/bindings/lib/macros.h
index 931c97895298b742ab9593dfd2102e99b911c9c0..62f4292c1ee8b01e96745d84566680c803f11417 100644
--- a/mojo/public/cpp/system/macros.h
+++ b/mojo/public/cpp/bindings/lib/macros.h
@@ -2,16 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-// Define a set of C++ specific macros.
-// Mojo C++ API users can assume that mojo/public/cpp/system/macros.h
-// includes mojo/public/c/system/macros.h.
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_MACROS_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_MACROS_H_
-#ifndef MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
-#define MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
-
-#include <stddef.h>
-
-#include "mojo/public/c/system/macros.h" // Symbols exposed.
+// This file defines macros that are only used by generated bindings.
// The C++ standard requires that static const members have an out-of-class
// definition (in a single compilation unit), but MSVC chokes on this (when
@@ -36,4 +30,4 @@
#define MOJO_STATIC_CONST_MEMBER_DEFINITION
#endif
-#endif // MOJO_PUBLIC_CPP_SYSTEM_MACROS_H_
+#endif // MOJO_PUBLIC_CPP_BINDINGS_LIB_MACROS_H_
« no previous file with comments | « mojo/public/cpp/bindings/lib/filter_chain.h ('k') | mojo/public/cpp/bindings/lib/shared_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698