[haiku-commits] haiku: hrev44740 - src/add-ons/translators/shared
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 3 Nov 2012 13:38:42 +0100 (CET)
hrev44740 adds 1 changeset to branch 'master'
old head: 6e50e79e543b83ed2983b23a018abd3caa93efaf
new head: 114d994682cc424f40892b11cc567f9f47a3a0be
----------------------------------------------------------------------------
114d994: Don't pollute global namespace with min/max defines.
Fixes build on new gcc4 revision.
[ Rene Gollent <anevilyak@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44740
Commit: 114d994682cc424f40892b11cc567f9f47a3a0be
URL: http://cgit.haiku-os.org/haiku/commit/?id=114d994
Author: Rene Gollent <anevilyak@xxxxxxxxx>
Date: Sat Nov 3 12:35:43 2012 UTC
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 9 deletions(-)
src/add-ons/translators/shared/BaseTranslator.cpp | 8 ++++++--
src/add-ons/translators/shared/BaseTranslator.h | 7 -------
----------------------------------------------------------------------------
diff --git a/src/add-ons/translators/shared/BaseTranslator.cpp
b/src/add-ons/translators/shared/BaseTranslator.cpp
index 9dbbb6b..3397a38 100644
--- a/src/add-ons/translators/shared/BaseTranslator.cpp
+++ b/src/add-ons/translators/shared/BaseTranslator.cpp
@@ -30,13 +30,16 @@
// DEALINGS IN THE SOFTWARE.
/*****************************************************************************/
+#include "BaseTranslator.h"
+
#include <string.h>
#include <stdio.h>
+#include <algorithm>
+
#include <Catalog.h>
#include <Locale.h>
-#include "BaseTranslator.h"
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "BaseTranslator"
@@ -546,7 +549,8 @@ BaseTranslator::translate_from_bits_to_bits(BPositionIO
*inSource,
if (writ < 0)
break;
remaining -= static_cast<uint32>(writ);
- rd = inSource->Read(buf, min(1024, remaining));
+ rd = inSource->Read(buf, std::min(1024UL,
+ remaining));
}
if (remaining > 0)
diff --git a/src/add-ons/translators/shared/BaseTranslator.h
b/src/add-ons/translators/shared/BaseTranslator.h
index 8e00cae..06035c2 100644
--- a/src/add-ons/translators/shared/BaseTranslator.h
+++ b/src/add-ons/translators/shared/BaseTranslator.h
@@ -43,13 +43,6 @@
#include <View.h>
#include "TranslatorSettings.h"
-#ifndef min
-#define min(a,b) ((a < b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a,b) ((a > b) ? (a) : (b))
-#endif
-
class BaseTranslator : public BTranslator {
public:
BaseTranslator(const char *name, const char *info,
Other related posts:
- » [haiku-commits] haiku: hrev44740 - src/add-ons/translators/shared - anevilyak
