aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp/common/insecure_create_auth_context.cc
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-28 12:43:02 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-28 12:43:02 -0700
commit3bd96959398d0671fee3785d4b2aee6042649b15 (patch)
treeabc5288b8a4a95b3fb1d5a922bf3b1b75c5bddbc /src/cpp/common/insecure_create_auth_context.cc
parentc65ed870ed45522194c0fcb884c9098672ac35ba (diff)
parente5cc05b5c6cee7026a0d28d39925621451506820 (diff)
Merge github.com:grpc/grpc into idempotent
Diffstat (limited to 'src/cpp/common/insecure_create_auth_context.cc')
-rw-r--r--src/cpp/common/insecure_create_auth_context.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/common/insecure_create_auth_context.cc b/src/cpp/common/insecure_create_auth_context.cc
index b2e153229a..7ec5d9bd12 100644
--- a/src/cpp/common/insecure_create_auth_context.cc
+++ b/src/cpp/common/insecure_create_auth_context.cc
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2015, Google Inc.
+ * Copyright 2015-2016, Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,8 +32,8 @@
*/
#include <memory>
-#include <grpc/grpc.h>
#include <grpc++/security/auth_context.h>
+#include <grpc/grpc.h>
namespace grpc {