diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 20:20:30 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 20:20:30 +0000 |
| commit | dc72da3bad9b1e8f1dade1a094961051a8680d06 (patch) | |
| tree | b0514a63e4a9a937472bdcb88c4dca7d07d5a87b /base/logging.h | |
| parent | e7137b2c4eef41bd31f3eac4df54c01b2bde04df (diff) | |
| download | chromium_src-dc72da3bad9b1e8f1dade1a094961051a8680d06.zip chromium_src-dc72da3bad9b1e8f1dade1a094961051a8680d06.tar.gz chromium_src-dc72da3bad9b1e8f1dade1a094961051a8680d06.tar.bz2 | |
base: Reenable external templates in logging.h when using component build.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8360023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.h')
| -rw-r--r-- | base/logging.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/base/logging.h b/base/logging.h index 2007b04..6d05ceb 100644 --- a/base/logging.h +++ b/base/logging.h @@ -469,18 +469,22 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) { } // MSVC doesn't like complex extern templates and DLLs. -#if !defined(COMPILER_MSVC) && !defined(COMPONENT_BUILD) +#if !defined(COMPILER_MSVC) // Commonly used instantiations of MakeCheckOpString<>. Explicitly instantiated // in logging.cc. -extern template std::string* MakeCheckOpString<int, int>( +extern template BASE_EXPORT std::string* MakeCheckOpString<int, int>( const int&, const int&, const char* names); -extern template std::string* MakeCheckOpString<unsigned long, unsigned long>( +extern template BASE_EXPORT +std::string* MakeCheckOpString<unsigned long, unsigned long>( const unsigned long&, const unsigned long&, const char* names); -extern template std::string* MakeCheckOpString<unsigned long, unsigned int>( +extern template BASE_EXPORT +std::string* MakeCheckOpString<unsigned long, unsigned int>( const unsigned long&, const unsigned int&, const char* names); -extern template std::string* MakeCheckOpString<unsigned int, unsigned long>( +extern template BASE_EXPORT +std::string* MakeCheckOpString<unsigned int, unsigned long>( const unsigned int&, const unsigned long&, const char* names); -extern template std::string* MakeCheckOpString<std::string, std::string>( +extern template BASE_EXPORT +std::string* MakeCheckOpString<std::string, std::string>( const std::string&, const std::string&, const char* name); #endif |