From 2d70b487086cb47ddaa9a4730b23c741d3ab9624 Mon Sep 17 00:00:00 2001 From: Paul-Edouard Sarlin Date: Fri, 9 Feb 2024 12:01:03 +0100 Subject: [PATCH] Future-proof --- _pyceres/logging.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_pyceres/logging.h b/_pyceres/logging.h index 031bb67..21eec4c 100644 --- a/_pyceres/logging.h +++ b/_pyceres/logging.h @@ -105,7 +105,7 @@ class LogMessageFatalThrow : public google::LogMessage { prefix_(__MakeExceptionPrefix(file, line)){}; LogMessageFatalThrow(const char* file, int line, -#if GLOG_VERSION_MAJOR >= 0 && GLOG_VERSION_MINOR >= 7 +#if GLOG_VERSION_MAJOR > 0 || GLOG_VERSION_MINOR >= 7 const google::logging::internal::CheckOpString& result) #else const google::CheckOpString& result) @@ -215,7 +215,7 @@ void BindLogging(py::module& m) { .value("ERROR", Logging::LogSeverity::GLOG_ERROR) .value("FATAL", Logging::LogSeverity::GLOG_FATAL) .export_values(); -#if GLOG_VERSION_MAJOR >= 0 && GLOG_VERSION_MINOR >= 6 +#if GLOG_VERSION_MAJOR > 0 || GLOG_VERSION_MINOR >= 6 if (!google::IsGoogleLoggingInitialized()) #endif {