diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-09-12 10:32:01 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-09-14 10:03:57 -0700 |
| commit | 13fd045dbb2b4dacea32be162a41d5a4b0d1802f (patch) | |
| tree | c219e7eb18b82523e36c6748861c403a14ea66ae /src/google/protobuf/message_lite.h | |
| parent | d1bc27caef8377a710370189675cb0958443e8f1 (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/message_lite.h')
| -rw-r--r-- | src/google/protobuf/message_lite.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index 2075f4b6..5cd6babc 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -43,25 +43,7 @@ #include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/once.h> - - -#if LANG_CXX11 && !defined(__NVCC__) -#define PROTOBUF_CXX11 1 -#else -#define PROTOBUF_CXX11 0 -#endif - -#if PROTOBUF_CXX11 -#define PROTOBUF_FINAL final -#else -#define PROTOBUF_FINAL -#endif - -#ifndef LIBPROTOBUF_EXPORT -#define LIBPROTOBUF_EXPORT -#endif - -#define PROTOBUF_RUNTIME_DEPRECATED(message) +#include <google/protobuf/stubs/port.h> namespace google { namespace protobuf { |