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

Unified Diff: ppapi/cpp/completion_callback.h

Issue 10332018: Work around linker error of multiple definitions of pp::BlockUntilComplete (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove .cc Created 8 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 | « no previous file | ppapi/cpp/completion_callback.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/cpp/completion_callback.h
diff --git a/ppapi/cpp/completion_callback.h b/ppapi/cpp/completion_callback.h
index 9539dfc73b659a8b3c0879cde99da36b248659cf..2391a3a5e1b506e61ba69d3a4ff801ff545cf267 100644
--- a/ppapi/cpp/completion_callback.h
+++ b/ppapi/cpp/completion_callback.h
@@ -255,7 +255,11 @@ class CompletionCallbackWithOutput : public CompletionCallback {
/// allowed from background threads.
///
/// @return A <code>CompletionCallback</code> corresponding to a NULL callback.
-CompletionCallback BlockUntilComplete();
+inline CompletionCallback BlockUntilComplete() {
+ // Note: Explicitly inlined to avoid link errors when included into
+ // ppapi_proxy and ppapi_cpp_objects.
+ return CompletionCallback();
+}
} // namespace pp
« no previous file with comments | « no previous file | ppapi/cpp/completion_callback.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698