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

Unified Diff: runtime/platform/globals.h

Issue 1101083003: Fixes to enable building dart io implementation in mojo tree (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 8 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 | « runtime/platform/assert.h ('k') | runtime/vm/object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/platform/globals.h
diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
index 1e8b786ee368fc123430590602dc46bc273ad5e1..6837265c23de032b3977c366db6508b97a13e04f 100644
--- a/runtime/platform/globals.h
+++ b/runtime/platform/globals.h
@@ -96,6 +96,8 @@
#error Automatic target os detection failed.
#endif
+namespace dart {
+
struct simd128_value_t {
union {
int32_t int_storage[4];
@@ -377,27 +379,30 @@ inline double MicrosecondsToMilliseconds(int64_t micros) {
// A macro to disallow the copy constructor and operator= functions.
// This should be used in the private: declarations for a class.
+#if !defined(DISALLOW_COPY_AND_ASSIGN)
Ivan Posva 2015/04/27 04:49:35 Where are these coming from otherwise?
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
private: \
TypeName(const TypeName&); \
void operator=(const TypeName&)
-
+#endif // !defined(DISALLOW_COPY_AND_ASSIGN)
// A macro to disallow all the implicit constructors, namely the default
// constructor, copy constructor and operator= functions. This should be
// used in the private: declarations for a class that wants to prevent
// anyone from instantiating it. This is especially useful for classes
// containing only static methods.
+#if !defined(DISALLOW_IMPLICIT_CONSTRUCTORS)
#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
private: \
TypeName(); \
DISALLOW_COPY_AND_ASSIGN(TypeName)
-
+#endif // !defined(DISALLOW_IMPLICIT_CONSTRUCTORS)
// Macro to disallow allocation in the C++ heap. This should be used
// in the private section for a class. Don't use UNREACHABLE here to
// avoid circular dependencies between platform/globals.h and
// platform/assert.h.
+#if !defined(DISALLOW_ALLOCATION)
#define DISALLOW_ALLOCATION() \
public: \
void operator delete(void* pointer) { \
@@ -406,7 +411,7 @@ public: \
} \
private: \
void* operator new(size_t size);
-
+#endif // !defined(DISALLOW_ALLOCATION)
// The USE(x) template is used to silence C++ compiler warnings issued
// for unused variables.
@@ -543,4 +548,6 @@ static inline T ReadUnaligned(const T* ptr) {
#define PRINTF_ATTRIBUTE(string_index, first_to_check)
#endif
+} // namespace dart
+
#endif // PLATFORM_GLOBALS_H_
« no previous file with comments | « runtime/platform/assert.h ('k') | runtime/vm/object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698