diff options
| author |  Jisi Liu <liujisi@google.com> | 2016-04-19 15:21:37 -0700 |
|---|---|---|
| committer | Jisi Liu <liujisi@google.com> | 2016-04-19 15:21:37 -0700 |
| commit | 1dc81948f50f74d441a37ad189e294878ca3f360 (patch) | |
| tree | d630f178a94377fd0bec5e0af288070554b42b98 | |
| parent | 52825bf91a4676dd7745bd37df69a9452fa75434 (diff) | |
| parent | 1b0ff34b90330187e0e32251664c46789c9710d0 (diff) | |
Merge pull request #1428 from pherl/master
Add missing includes in field mask test
| -rw-r--r-- | src/google/protobuf/util/field_mask_util_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/util/field_mask_util_test.cc b/src/google/protobuf/util/field_mask_util_test.cc index b3787857..9b7fb62a 100644 --- a/src/google/protobuf/util/field_mask_util_test.cc +++ b/src/google/protobuf/util/field_mask_util_test.cc @@ -30,6 +30,8 @@ #include <google/protobuf/util/field_mask_util.h> +#include <algorithm> + #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/common.h> #include <google/protobuf/field_mask.pb.h> |