From f157a5651c79a7a36e242af216a5d5b383ba8af2 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Fri, 14 Nov 2014 11:50:31 -0800
Subject: Down-integrate from internal code base (C++ maps support).

---
 src/google/protobuf/stubs/common.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/google/protobuf/stubs')

diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index 55deb125..b7e11749 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -267,6 +267,8 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
 #endif
 
 #define GOOGLE_GUARDED_BY(x)
+#define GOOGLE_FALLTHROUGH_INTENDED
+#define GOOGLE_ATTRIBUTE_COLD
 
 // x86 and x86-64 can perform unaligned loads/stores directly.
 #if defined(_M_X64) || defined(__x86_64__) || \
-- 
cgit v1.2.3