34
34
#include < string.h>
35
35
#include < limits.h>
36
36
37
- #define MIN (a, b ) ((a) < (b) ? (a) : (b))
38
-
39
37
#define THROW_AND_RETURN_UNLESS_BUFFER (env, obj ) \
40
38
THROW_AND_RETURN_IF_NOT_BUFFER (env, obj, " argument" ) \
41
39
@@ -518,9 +516,9 @@ void Copy(const FunctionCallbackInfo<Value> &args) {
518
516
if (source_end - source_start > target_length - target_start)
519
517
source_end = source_start + target_length - target_start;
520
518
521
- uint32_t to_copy = MIN ( MIN (source_end - source_start,
522
- target_length - target_start),
523
- ts_obj_length - source_start);
519
+ uint32_t to_copy = std::min (
520
+ std::min (source_end - source_start, target_length - target_start),
521
+ ts_obj_length - source_start);
524
522
525
523
memmove (target_data + target_start, ts_obj_data + source_start, to_copy);
526
524
args.GetReturnValue ().Set (to_copy);
@@ -551,7 +549,8 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
551
549
if (Buffer::HasInstance (args[1 ])) {
552
550
SPREAD_BUFFER_ARG (args[1 ], fill_obj);
553
551
str_length = fill_obj_length;
554
- memcpy (ts_obj_data + start, fill_obj_data, MIN (str_length, fill_length));
552
+ memcpy (
553
+ ts_obj_data + start, fill_obj_data, std::min (str_length, fill_length));
555
554
goto start_fill;
556
555
}
557
556
@@ -572,15 +571,15 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
572
571
if (enc == UTF8) {
573
572
str_length = str_obj->Utf8Length (env->isolate ());
574
573
node::Utf8Value str (env->isolate (), args[1 ]);
575
- memcpy (ts_obj_data + start, *str, MIN (str_length, fill_length));
574
+ memcpy (ts_obj_data + start, *str, std::min (str_length, fill_length));
576
575
577
576
} else if (enc == UCS2) {
578
577
str_length = str_obj->Length () * sizeof (uint16_t );
579
578
node::TwoByteValue str (env->isolate (), args[1 ]);
580
579
if (IsBigEndian ())
581
580
SwapBytes16 (reinterpret_cast <char *>(&str[0 ]), str_length);
582
581
583
- memcpy (ts_obj_data + start, *str, MIN (str_length, fill_length));
582
+ memcpy (ts_obj_data + start, *str, std::min (str_length, fill_length));
584
583
585
584
} else {
586
585
// Write initial String to Buffer, then use that memory to copy remainder
@@ -645,7 +644,7 @@ void StringWrite(const FunctionCallbackInfo<Value>& args) {
645
644
THROW_AND_RETURN_IF_OOB (ParseArrayIndex (env, args[2 ], ts_obj_length - offset,
646
645
&max_length));
647
646
648
- max_length = MIN (ts_obj_length - offset, max_length);
647
+ max_length = std::min (ts_obj_length - offset, max_length);
649
648
650
649
if (max_length == 0 )
651
650
return args.GetReturnValue ().Set (0 );
@@ -714,9 +713,9 @@ void CompareOffset(const FunctionCallbackInfo<Value> &args) {
714
713
CHECK_LE (source_start, source_end);
715
714
CHECK_LE (target_start, target_end);
716
715
717
- size_t to_cmp = MIN ( MIN (source_end - source_start,
718
- target_end - target_start),
719
- ts_obj_length - source_start);
716
+ size_t to_cmp =
717
+ std::min ( std::min (source_end - source_start, target_end - target_start),
718
+ ts_obj_length - source_start);
720
719
721
720
int val = normalizeCompareVal (to_cmp > 0 ?
722
721
memcmp (ts_obj_data + source_start,
@@ -736,7 +735,7 @@ void Compare(const FunctionCallbackInfo<Value> &args) {
736
735
SPREAD_BUFFER_ARG (args[0 ], obj_a);
737
736
SPREAD_BUFFER_ARG (args[1 ], obj_b);
738
737
739
- size_t cmp_length = MIN (obj_a_length, obj_b_length);
738
+ size_t cmp_length = std::min (obj_a_length, obj_b_length);
740
739
741
740
int val = normalizeCompareVal (cmp_length > 0 ?
742
741
memcmp (obj_a_data, obj_b_data, cmp_length) : 0 ,
0 commit comments