generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 11:06:50 +01:00
Code Issues Projects Releases Wiki Activity

fix(Logger): Autodetect line number type from __LINE__ (#4553)

Browse Source 
MS Visual Studio can use type long for __LINE__ macro when /ZI
compilation flag is used - https://learn.microsoft.com/en-us/cpp/build/
reference/z7-zi-zi-debug-information-format?view=msvc-170#zi-1
This breaks some poco interfaces, for ex. logger
We should fix type for line number
This commit is contained in:
Alexander B
2024-05-15 14:43:24 +03:00
committed by GitHub
parent ad72b25ace
commit 4552df2f2e
14 changed files with 83 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Foundation/include/Poco/NestedDiagnosticContext.h
View File

@@ -68,7 +68,7 @@ public:
void push(const std::string& info);
/// Pushes a context (without line number and filename) onto the stack.
void push(const std::string& info, int line, const char* filename);
void push(const std::string& info, LineNumber line, const char* filename);
/// Pushes a context (including line number and filename)
/// onto the stack. Filename must be a static string, such as the
/// one produced by the __FILE__ preprocessor macro.
@@ -104,7 +104,7 @@ private:
{
std::string info;
const char* file;
int line;
LineNumber line;
};
typedef std::vector<Context> Stack;
@@ -124,7 +124,7 @@ public:
NDCScope(const std::string& info);
/// Pushes a context on the stack.
NDCScope(const std::string& info, int line, const char* filename);
NDCScope(const std::string& info, LineNumber line, const char* filename);
/// Pushes a context on the stack.
~NDCScope();
@@ -141,7 +141,7 @@ inline NDCScope::NDCScope(const std::string& info)
}
inline NDCScope::NDCScope(const std::string& info, int line, const char* filename)
inline NDCScope::NDCScope(const std::string& info, LineNumber line, const char* filename)
{
NestedDiagnosticContext::current().push(info, line, filename);
}