From 8c3dd6d83df467f3b8e53b6c97545eabf07768be Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 18 Jun 2020 13:23:12 +0200 Subject: Upgrade Google libraries Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0. Hopefully this will solve compilation error on MSVC with C++17. --- extern/glog/src/symbolize.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'extern/glog/src/symbolize.h') diff --git a/extern/glog/src/symbolize.h b/extern/glog/src/symbolize.h index f617184249c..c6f9ec4360e 100644 --- a/extern/glog/src/symbolize.h +++ b/extern/glog/src/symbolize.h @@ -116,8 +116,11 @@ _START_GOOGLE_NAMESPACE_ // counter "pc". The callback function should write output to "out" // and return the size of the output written. On error, the callback // function should return -1. -typedef int (*SymbolizeCallback)(int fd, void *pc, char *out, size_t out_size, - uint64 relocation); +typedef int (*SymbolizeCallback)(int fd, + void* pc, + char* out, + size_t out_size, + uint64_t relocation); void InstallSymbolizeCallback(SymbolizeCallback callback); // Installs a callback function, which will be called instead of @@ -131,9 +134,9 @@ void InstallSymbolizeCallback(SymbolizeCallback callback); // returns -1. |out_file_name_size| is the size of the file name buffer // (including the null-terminator). typedef int (*SymbolizeOpenObjectFileCallback)(uint64_t pc, - uint64_t &start_address, - uint64_t &base_address, - char *out_file_name, + uint64_t& start_address, + uint64_t& base_address, + char* out_file_name, int out_file_name_size); void InstallSymbolizeOpenObjectFileCallback( SymbolizeOpenObjectFileCallback callback); @@ -148,7 +151,7 @@ _START_GOOGLE_NAMESPACE_ // symbol name to "out". The symbol name is demangled if possible // (supports symbols generated by GCC 3.x or newer). Otherwise, // returns false. -bool Symbolize(void *pc, char *out, int out_size); +GOOGLE_GLOG_DLL_DECL bool Symbolize(void *pc, char *out, int out_size); _END_GOOGLE_NAMESPACE_ -- cgit v1.2.3