[Bf-blender-cvs] [372dcacbe4f] master: Windows: Cleanup warning about non returning dtor

Ray Molenkamp noreply at git.blender.org
Wed Mar 11 21:07:53 CET 2020


Commit: 372dcacbe4f3131115166c725820305a6823a5e1
Author: Ray Molenkamp
Date:   Wed Mar 11 14:07:47 2020 -0600
Branches: master
https://developer.blender.org/rB372dcacbe4f3131115166c725820305a6823a5e1

Windows: Cleanup warning about non returning dtor

`google::LogMessageFatal::~LogMessageFatal` calls `abort`
which MSVC correctly identifies as 'not returning'
and warns about a potential memory leak.

Given this is intended behaviour and glog is not overly
concerned with shutting down the process nicely, we
can safely ignore this warning.

===================================================================

M	extern/glog/CMakeLists.txt

===================================================================

diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index c60e30d0b48..d7ad04435e8 100644
--- a/extern/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -77,6 +77,9 @@ if(WIN32)
   list(APPEND INC
     src/windows
   )
+  # Repress warning about google::LogMessageFatal::~LogMessageFatal
+  # not returning.
+  add_definitions("/wd4722")
 else()
   list(APPEND INC
     include



More information about the Bf-blender-cvs mailing list