Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: third_party/grpc/include/grpc++/impl/thd_cxx11.h

Issue 1932353002: Initial checkin of gRPC to third_party/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/grpc/include/grpc++/impl/thd.h ('k') | third_party/grpc/include/grpc++/impl/thd_no_cxx11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/grpc/include/grpc++/impl/thd_cxx11.h
diff --git a/third_party/tcmalloc/chromium/src/google/malloc_hook_c.h b/third_party/grpc/include/grpc++/impl/thd_cxx11.h
similarity index 86%
copy from third_party/tcmalloc/chromium/src/google/malloc_hook_c.h
copy to third_party/grpc/include/grpc++/impl/thd_cxx11.h
index e3ac0a4999751c5112cd6513f3a7f6706c35fbb8..2055b1d5389e28f472b8bb2c55c6da01dc55566a 100644
--- a/third_party/tcmalloc/chromium/src/google/malloc_hook_c.h
+++ b/third_party/grpc/include/grpc++/impl/thd_cxx11.h
@@ -1,10 +1,12 @@
-/* Copyright (c) 2008, Google Inc.
+/*
+ *
+ * Copyright 2015, Google Inc.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
@@ -14,7 +16,7 @@
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -26,9 +28,18 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
*/
-/* The code has moved to gperftools/. Use that include-directory for
- * new code.
- */
-#include <gperftools/malloc_hook_c.h>
+#ifndef GRPCXX_IMPL_THD_CXX11_H
+#define GRPCXX_IMPL_THD_CXX11_H
+
+#include <thread>
+
+namespace grpc {
+
+using std::thread;
+
+} // namespace grpc
+
+#endif // GRPCXX_IMPL_THD_CXX11_H
« no previous file with comments | « third_party/grpc/include/grpc++/impl/thd.h ('k') | third_party/grpc/include/grpc++/impl/thd_no_cxx11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698