libweave: Fixed _DEBUG build One DPCHECK was not previously removed. Added BASE_EXPORT used by FROM_HERE. BUG=none TEST=none Change-Id: Icce0fb6d46f9961f70e74f9465e22bebbbdd0fe9 Reviewed-on: https://chromium-review.googlesource.com/295216 Reviewed-by: Vitaly Buka <vitalybuka@chromium.org> Commit-Queue: Vitaly Buka <vitalybuka@chromium.org> Tested-by: Vitaly Buka <vitalybuka@chromium.org>
diff --git a/libweave/external/base/location.h b/libweave/external/base/location.h index 7ec57f3..4a38264 100644 --- a/libweave/external/base/location.h +++ b/libweave/external/base/location.h
@@ -15,7 +15,7 @@ // Location provides basic info where of an object was constructed, or was // significantly brought to life. -class Location { +class BASE_EXPORT Location { public: // Constructor should be called with a long-lived char*, such as __FILE__. // It assumes the provided value will persist as a global constant, and it @@ -76,7 +76,7 @@ int line_number; }; -const void* GetProgramCounter(); +BASE_EXPORT const void* GetProgramCounter(); // Define a macro to record the current source location. #define FROM_HERE FROM_HERE_WITH_EXPLICIT_FUNCTION(__FUNCTION__)
diff --git a/libweave/external/base/logging.h b/libweave/external/base/logging.h index c3be83f..0096d9d 100644 --- a/libweave/external/base/logging.h +++ b/libweave/external/base/logging.h
@@ -157,7 +157,7 @@ // Implementation of the InitLogging() method declared below. We use a // more-specific name so we can #define it above without affecting other code // that has named stuff "InitLogging". -bool BASE_EXPORT BaseInitLoggingImpl(const LoggingSettings& settings); +BASE_EXPORT bool BaseInitLoggingImpl(const LoggingSettings& settings); // Sets the log file name and other global logging state. Calling this function // is recommended, and is normally done at the beginning of application init.
diff --git a/libweave/external/base/logging_unittest.cc b/libweave/external/base/logging_unittest.cc index d51015d..e3c84e3 100644 --- a/libweave/external/base/logging_unittest.cc +++ b/libweave/external/base/logging_unittest.cc
@@ -175,7 +175,6 @@ DCHECK_EQ(0, 0) << mock_log_source.Log(); #else DCHECK(mock_log_source.Log()) << mock_log_source.Log(); - DPCHECK(mock_log_source.Log()) << mock_log_source.Log(); DCHECK_EQ(0, 0) << mock_log_source.Log(); DCHECK_EQ(mock_log_source.Log(), static_cast<const char*>(NULL)) << mock_log_source.Log();