diff options
author | Jisi Liu <liujisi@google.com> | 2017-10-13 13:18:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-13 13:18:42 -0700 |
commit | f850188e6e1021b4fe21ecb0aca548a54c272ce5 (patch) | |
tree | f95bd921a85c9b8710e2a4b506b1ebf3e4c1ce19 /src/google/protobuf/util | |
parent | a632f0dbac406227fad0951262f3b6160eaabebe (diff) | |
parent | 5992e24e8a4ab76f4e451dea5ad01711a5b6cb82 (diff) | |
download | protobuf-f850188e6e1021b4fe21ecb0aca548a54c272ce5.tar.gz protobuf-f850188e6e1021b4fe21ecb0aca548a54c272ce5.tar.bz2 protobuf-f850188e6e1021b4fe21ecb0aca548a54c272ce5.zip |
Merge pull request #3744 from fmarier/json-escaping-namespace
Move namespace closing brace inside the header guard block
Diffstat (limited to 'src/google/protobuf/util')
-rw-r--r-- | src/google/protobuf/util/internal/json_escaping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/json_escaping.h b/src/google/protobuf/util/internal/json_escaping.h index e3e329fc..9b8b2afd 100644 --- a/src/google/protobuf/util/internal/json_escaping.h +++ b/src/google/protobuf/util/internal/json_escaping.h @@ -86,6 +86,6 @@ class JsonEscaping { } // namespace converter } // namespace util } // namespace protobuf +} // namespace google #endif // NET_PROTO2_UTIL_CONVERTER_STRINGS_JSON_ESCAPING_H_ -} // namespace google |