You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by mc...@apache.org on 2004/04/02 10:36:39 UTC
cvs commit: logging-log4cxx/src formattinginfo.cpp
mcatan 2004/04/02 00:36:39
Modified: include/log4cxx/helpers formattinginfo.h
src formattinginfo.cpp
Log:
changed min and max to minChar and maxChar because of a VC6/VC7 conflict with min/max macros
Revision Changes Path
1.4 +2 -2 logging-log4cxx/include/log4cxx/helpers/formattinginfo.h
Index: formattinginfo.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/formattinginfo.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- formattinginfo.h 20 Jan 2004 22:16:12 -0000 1.3
+++ formattinginfo.h 2 Apr 2004 08:36:39 -0000 1.4
@@ -31,8 +31,8 @@
{
public:
- int min;
- int max;
+ int minChar;
+ int maxChar;
bool leftAlign;
FormattingInfo();
1.3 +4 -4 logging-log4cxx/src/formattinginfo.cpp
Index: formattinginfo.cpp
===================================================================
RCS file: /home/cvs/logging-log4cxx/src/formattinginfo.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- formattinginfo.cpp 11 Jun 2003 18:34:39 -0000 1.2
+++ formattinginfo.cpp 2 Apr 2004 08:36:39 -0000 1.3
@@ -26,15 +26,15 @@
void FormattingInfo::reset()
{
- min = -1;
- max = 0x7FFFFFFF;
+ minChar = -1;
+ maxChar = 0x7FFFFFFF;
leftAlign = false;
}
void FormattingInfo::dump()
{
- LOGLOG_DEBUG(_T("min=") << min
- << _T(", max=") << max
+ LOGLOG_DEBUG(_T("minChar=") << minChar
+ << _T(", maxChar=") << maxChar
<< _T(", leftAlign=") << leftAlign);
}