| Index: base/logging.h
|
| diff --git a/base/logging.h b/base/logging.h
|
| index 2007b0426c4d4ff5937592904fc2fc03b8b15aad..6d05ceb6d0758801123ad7f6cf88d7b6585338e1 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
|
|
|
|
|