diff options
| author | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:05:24 +0000 |
|---|---|---|
| committer | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:05:24 +0000 |
| commit | 76ea509a07c4620e5f2bd6ca31577f178754ada9 (patch) | |
| tree | 346c94cf10aa2574e6273984102d2c64bdf1586a | |
| parent | e9e9c6d4044854227199be9fe0d6816846f4c343 (diff) | |
| download | chromium_src-76ea509a07c4620e5f2bd6ca31577f178754ada9.zip chromium_src-76ea509a07c4620e5f2bd6ca31577f178754ada9.tar.gz chromium_src-76ea509a07c4620e5f2bd6ca31577f178754ada9.tar.bz2 | |
Work around linker error of multiple definitions of pp::BlockUntilComplete.
BUG=121561
R=brettw
Review URL: https://chromiumcodereview.appspot.com/10332018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135429 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ppapi/cpp/completion_callback.cc | 13 | ||||
| -rw-r--r-- | ppapi/cpp/completion_callback.h | 6 | ||||
| -rw-r--r-- | ppapi/ppapi_proxy.gypi | 1 | ||||
| -rw-r--r-- | ppapi/ppapi_sources.gypi | 1 |
4 files changed, 5 insertions, 16 deletions
diff --git a/ppapi/cpp/completion_callback.cc b/ppapi/cpp/completion_callback.cc deleted file mode 100644 index 982031d..0000000 --- a/ppapi/cpp/completion_callback.cc +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ppapi/cpp/completion_callback.h" - -namespace pp { - -CompletionCallback BlockUntilComplete() { - return CompletionCallback(); -} - -} // namespace pp diff --git a/ppapi/cpp/completion_callback.h b/ppapi/cpp/completion_callback.h index 9539dfc..2391a3a 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 diff --git a/ppapi/ppapi_proxy.gypi b/ppapi/ppapi_proxy.gypi index 0654072..8b918bc 100644 --- a/ppapi/ppapi_proxy.gypi +++ b/ppapi/ppapi_proxy.gypi @@ -33,7 +33,6 @@ # full C++ wrappers at this layer since the C++ wrappers expect # symbols defining the globals for "being a plugin" which we are not. # These callback files are standalone. - 'cpp/completion_callback.cc', 'cpp/completion_callback.h', 'utility/completion_callback_factory.h', diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi index 4a9c8d7..db54e62 100644 --- a/ppapi/ppapi_sources.gypi +++ b/ppapi/ppapi_sources.gypi @@ -136,7 +136,6 @@ 'cpp/audio.h', 'cpp/audio_config.cc', 'cpp/audio_config.h', - 'cpp/completion_callback.cc', 'cpp/completion_callback.h', 'cpp/core.cc', 'cpp/core.h', |