--- a/c10/util/logging_is_google_glog.h +++ b/c10/util/logging_is_google_glog.h @@ -52,7 +52,7 @@ namespace c10 { -[[noreturn]] void ThrowEnforceNotMet( +[[noreturn]] C10_API void ThrowEnforceNotMet( const char* file, const int line, const char* condition, --- a/c10/util/Logging.cpp +++ b/c10/util/Logging.cpp @@ -327,23 +327,13 @@ google::GLOG_WARNING, "The minimum log level that caffe2 will output."); -// Google glog's api does not have an external function that allows one to check -// if glog is initialized or not. It does have an internal function - so we are -// declaring it here. This is a hack but has been used by a bunch of others too -// (e.g. Torch). -namespace google { -namespace glog_internal_namespace_ { -bool IsGoogleLoggingInitialized(); -} // namespace glog_internal_namespace_ -} // namespace google - namespace c10 { namespace { void initGoogleLogging(char const* name) { #if !defined(_MSC_VER) // This trick can only be used on UNIX platforms - if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized()) + if (!::google::IsGoogleLoggingInitialized()) #endif { ::google::InitGoogleLogging(name); @@ -394,7 +384,7 @@ void ShowLogInfoToStderr() { FLAGS_logtostderr = 1; - FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO); + FLAGS_minloglevel = std::min(FLAGS_minloglevel, google::GLOG_INFO); } } // namespace c10