diff options
author | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-03-13 16:37:29 -0700 |
commit | 0400cca3236de1ca303af38bf81eab332d042b7c (patch) | |
tree | a8a9b19853f64567c96750a1c7d253926471daa5 /src/google/protobuf/util/time_util.cc | |
parent | 96b535cc2f4f7b7e22a1b8622149f7c26a5a3f63 (diff) |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/util/time_util.cc')
-rw-r--r-- | src/google/protobuf/util/time_util.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/util/time_util.cc b/src/google/protobuf/util/time_util.cc index 46a6f5a8..d4912837 100644 --- a/src/google/protobuf/util/time_util.cc +++ b/src/google/protobuf/util/time_util.cc @@ -30,13 +30,14 @@ #include <google/protobuf/util/time_util.h> -#include <google/protobuf/stubs/time.h> #include <google/protobuf/stubs/int128.h> -#include <google/protobuf/stubs/strutil.h> #include <google/protobuf/stubs/stringprintf.h> +#include <google/protobuf/stubs/strutil.h> +#include <google/protobuf/stubs/time.h> #include <google/protobuf/duration.pb.h> #include <google/protobuf/timestamp.pb.h> + namespace google { namespace protobuf { namespace util { |