generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +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

12
Foundation/include/Poco/Message.h
View File

@@ -43,7 +43,7 @@ class Foundation_API Message
/// caused the message.
{
public:
typedef std::map<std::string, std::string> StringMap;
using StringMap = std::map<std::string, std::string>;
enum Priority
{
@@ -65,7 +65,7 @@ public:
/// Creates a Message with the given source, text and priority.
/// The thread and process ids are set.
Message(const std::string& source, const std::string& text, Priority prio, const char* file, int line);
Message(const std::string& source, const std::string& text, Priority prio, const char* file, LineNumber line);
/// Creates a Message with the given source, text, priority,
/// source file path and line.
///
@@ -155,14 +155,14 @@ public:
/// Returns the source file path of the code creating
/// the message. May be 0 if not set.
void setSourceLine(int line);
void setSourceLine(LineNumber line);
/// Sets the source file line of the statement
/// generating the log message.
///
/// This is usually the result of the __LINE__
/// macro.
int getSourceLine() const;
LineNumber getSourceLine() const;
/// Returns the source file line of the statement
/// generating the log message. May be 0
/// if not set.
@@ -211,7 +211,7 @@ private:
std::string _thread;
long _pid;
const char* _file;
int _line;
LineNumber _line;
StringMap* _pMap;
};
@@ -271,7 +271,7 @@ inline const char* Message::getSourceFile() const
}
inline int Message::getSourceLine() const
inline LineNumber Message::getSourceLine() const
{
return _line;
}