diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-03-15 22:58:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-15 22:58:20 -0700 |
commit | ab95b1bc1eb964ee5f1fb48297344c5d37d35191 (patch) | |
tree | 86be8bd31c7d9937f2943962f79df32116388085 | |
parent | aae10ed36d4d6c251acdd32fadf565659a596c4e (diff) | |
parent | 0e34c86ed24a49cf06be0fb2ad00f459687c9068 (diff) | |
download | protobuf-ab95b1bc1eb964ee5f1fb48297344c5d37d35191.tar.gz protobuf-ab95b1bc1eb964ee5f1fb48297344c5d37d35191.tar.bz2 protobuf-ab95b1bc1eb964ee5f1fb48297344c5d37d35191.zip |
Merge pull request #4371 from Rasrack/gnuc_minor
Fix spelling error of __GNUC_MINOR__
-rw-r--r-- | src/google/protobuf/stubs/hash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/hash.h b/src/google/protobuf/stubs/hash.h index d04a25e1..fd8ba156 100644 --- a/src/google/protobuf/stubs/hash.h +++ b/src/google/protobuf/stubs/hash.h @@ -93,7 +93,7 @@ # endif // GCC <= 4.1 does not define std::tr1::hash for `long long int` or `long long unsigned int` -# if __GNUC__ == 4 && defined(__GNUC__MINOR__) && __GNUC__MINOR__ <= 1 +# if __GNUC__ == 4 && defined(__GNUC_MINOR__) && __GNUC_MINOR__ <= 1 # undef GOOGLE_PROTOBUF_HAS_TR1 # undef GOOGLE_PROTOBUF_HAVE_HASH_MAP # undef GOOGLE_PROTOBUF_HAVE_HASH_SET |