aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-01-14 06:08:10 -0800
committerGravatar Craig Tiller <ctiller@google.com>2016-01-14 06:08:10 -0800
commit6d32e873a6d21758ff854aba9c6f27a7dc548f66 (patch)
tree2b1293766ec8bd767236816c0b84e0a9b9a11a4d
parent16a7dee6141785092ee2aae4a11d2e9f590a1847 (diff)
parenteeb02ba77a2076b40f37163f3b78facbd25722e7 (diff)
Merge pull request #4719 from murgatroid99/fix_copyrights_again
Update copyrights again
-rw-r--r--include/grpc++/generic/async_generic_service.h4
-rw-r--r--include/grpc++/support/byte_buffer.h4
-rw-r--r--include/grpc++/support/slice.h4
-rw-r--r--src/cpp/util/byte_buffer.cc4
-rw-r--r--test/cpp/qps/client.h4
-rw-r--r--test/cpp/qps/client_async.cc4
-rw-r--r--test/cpp/qps/client_sync.cc4
-rw-r--r--test/cpp/qps/generic_async_streaming_ping_pong_test.cc4
-rw-r--r--test/cpp/qps/qps_driver.cc6
-rw-r--r--test/cpp/qps/qps_worker.cc4
-rw-r--r--test/cpp/qps/server.h4
-rw-r--r--test/cpp/qps/server_async.cc4
12 files changed, 25 insertions, 25 deletions
diff --git a/include/grpc++/generic/async_generic_service.h b/include/grpc++/generic/async_generic_service.h
index f209c077e6..33045b8d85 100644
--- a/include/grpc++/generic/async_generic_service.h
+++ b/include/grpc++/generic/async_generic_service.h
@@ -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
@@ -76,4 +76,4 @@ class AsyncGenericService GRPC_FINAL {
} // namespace grpc
-#endif // GRPCXX_GENERIC_ASYNC_GENERIC_SERVICE_H
+#endif // GRPCXX_GENERIC_ASYNC_GENERIC_SERVICE_H \ No newline at end of file
diff --git a/include/grpc++/support/byte_buffer.h b/include/grpc++/support/byte_buffer.h
index d3f9b7b1d1..be1957ac84 100644
--- a/include/grpc++/support/byte_buffer.h
+++ b/include/grpc++/support/byte_buffer.h
@@ -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
@@ -107,4 +107,4 @@ class SerializationTraits<ByteBuffer, void> {
} // namespace grpc
-#endif // GRPCXX_SUPPORT_BYTE_BUFFER_H
+#endif // GRPCXX_SUPPORT_BYTE_BUFFER_H \ No newline at end of file
diff --git a/include/grpc++/support/slice.h b/include/grpc++/support/slice.h
index 8dce7e68af..30325ef90b 100644
--- a/include/grpc++/support/slice.h
+++ b/include/grpc++/support/slice.h
@@ -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
@@ -85,4 +85,4 @@ class Slice GRPC_FINAL {
} // namespace grpc
-#endif // GRPCXX_SUPPORT_SLICE_H
+#endif // GRPCXX_SUPPORT_SLICE_H \ No newline at end of file
diff --git a/src/cpp/util/byte_buffer.cc b/src/cpp/util/byte_buffer.cc
index 5245739c89..1c1d55271d 100644
--- a/src/cpp/util/byte_buffer.cc
+++ b/src/cpp/util/byte_buffer.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
@@ -89,4 +89,4 @@ ByteBuffer& ByteBuffer::operator=(const ByteBuffer& buf) {
return *this;
}
-} // namespace grpc
+} // namespace grpc \ No newline at end of file
diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h
index 03bbf03b6c..0159f4f1e6 100644
--- a/test/cpp/qps/client.h
+++ b/test/cpp/qps/client.h
@@ -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
@@ -377,4 +377,4 @@ std::unique_ptr<Client> CreateGenericAsyncStreamingClient(
} // namespace testing
} // namespace grpc
-#endif
+#endif \ No newline at end of file
diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc
index af55187b2b..d822d78aac 100644
--- a/test/cpp/qps/client_async.cc
+++ b/test/cpp/qps/client_async.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
@@ -605,4 +605,4 @@ std::unique_ptr<Client> CreateGenericAsyncStreamingClient(
}
} // namespace testing
-} // namespace grpc
+} // namespace grpc \ No newline at end of file
diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc
index 54cdf390d7..1045915b83 100644
--- a/test/cpp/qps/client_sync.cc
+++ b/test/cpp/qps/client_sync.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
@@ -172,4 +172,4 @@ std::unique_ptr<Client> CreateSynchronousStreamingClient(
}
} // namespace testing
-} // namespace grpc
+} // namespace grpc \ No newline at end of file
diff --git a/test/cpp/qps/generic_async_streaming_ping_pong_test.cc b/test/cpp/qps/generic_async_streaming_ping_pong_test.cc
index fe79b2d803..7a1275054a 100644
--- a/test/cpp/qps/generic_async_streaming_ping_pong_test.cc
+++ b/test/cpp/qps/generic_async_streaming_ping_pong_test.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
@@ -79,4 +79,4 @@ int main(int argc, char** argv) {
grpc::testing::RunGenericAsyncStreamingPingPong();
return 0;
-}
+} \ No newline at end of file
diff --git a/test/cpp/qps/qps_driver.cc b/test/cpp/qps/qps_driver.cc
index a8d404590c..76d1595c4b 100644
--- a/test/cpp/qps/qps_driver.cc
+++ b/test/cpp/qps/qps_driver.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
@@ -117,7 +117,7 @@ static void QpsDriver() {
params->set_resp_size(FLAGS_bbuf_resp_size);
if (FLAGS_bbuf_req_size >= 0) {
params->set_req_size(FLAGS_bbuf_req_size);
- }
+ }
} else {
// set a reasonable default: proto but no payload
client_config.mutable_payload_config()->mutable_simple_params();
@@ -184,4 +184,4 @@ int main(int argc, char** argv) {
grpc::testing::QpsDriver();
return 0;
-}
+} \ No newline at end of file
diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc
index ef2b633f68..e7714c0bb3 100644
--- a/test/cpp/qps/qps_worker.cc
+++ b/test/cpp/qps/qps_worker.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
@@ -239,4 +239,4 @@ QpsWorker::QpsWorker(int driver_port) {
QpsWorker::~QpsWorker() {}
} // namespace testing
-} // namespace grpc
+} // namespace grpc \ No newline at end of file
diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h
index 920fc56356..daee7c3663 100644
--- a/test/cpp/qps/server.h
+++ b/test/cpp/qps/server.h
@@ -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
@@ -112,4 +112,4 @@ std::unique_ptr<Server> CreateAsyncServer(const ServerConfig& config);
} // namespace testing
} // namespace grpc
-#endif
+#endif \ No newline at end of file
diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc
index b39d8c4d3e..da7646eaf2 100644
--- a/test/cpp/qps/server_async.cc
+++ b/test/cpp/qps/server_async.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
@@ -403,4 +403,4 @@ std::unique_ptr<Server> CreateAsyncGenericServer(const ServerConfig &config) {
}
} // namespace testing
-} // namespace grpc
+} // namespace grpc \ No newline at end of file