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
@@ -516,9 +514,9 @@ void Copy(const FunctionCallbackInfo<Value> &args) {
516
514
if (source_end - source_start > target_length - target_start)
517
515
source_end = source_start + target_length - target_start;
518
516
519
- uint32_t to_copy = MIN ( MIN (source_end - source_start,
520
- target_length - target_start),
521
- ts_obj_length - source_start);
517
+ uint32_t to_copy = std::min (
518
+ std::min (source_end - source_start, target_length - target_start),
519
+ ts_obj_length - source_start);
522
520
523
521
memmove (target_data + target_start, ts_obj_data + source_start, to_copy);
524
522
args.GetReturnValue ().Set (to_copy);
@@ -549,7 +547,8 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
549
547
if (Buffer::HasInstance (args[1 ])) {
550
548
SPREAD_BUFFER_ARG (args[1 ], fill_obj);
551
549
str_length = fill_obj_length;
552
- memcpy (ts_obj_data + start, fill_obj_data, MIN (str_length, fill_length));
550
+ memcpy (
551
+ ts_obj_data + start, fill_obj_data, std::min (str_length, fill_length));
553
552
goto start_fill;
554
553
}
555
554
@@ -570,15 +569,15 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
570
569
if (enc == UTF8) {
571
570
str_length = str_obj->Utf8Length (env->isolate ());
572
571
node::Utf8Value str (env->isolate (), args[1 ]);
573
- memcpy (ts_obj_data + start, *str, MIN (str_length, fill_length));
572
+ memcpy (ts_obj_data + start, *str, std::min (str_length, fill_length));
574
573
575
574
} else if (enc == UCS2) {
576
575
str_length = str_obj->Length () * sizeof (uint16_t );
577
576
node::TwoByteValue str (env->isolate (), args[1 ]);
578
577
if (IsBigEndian ())
579
578
SwapBytes16 (reinterpret_cast <char *>(&str[0 ]), str_length);
580
579
581
- memcpy (ts_obj_data + start, *str, MIN (str_length, fill_length));
580
+ memcpy (ts_obj_data + start, *str, std::min (str_length, fill_length));
582
581
583
582
} else {
584
583
// Write initial String to Buffer, then use that memory to copy remainder
@@ -643,7 +642,7 @@ void StringWrite(const FunctionCallbackInfo<Value>& args) {
643
642
THROW_AND_RETURN_IF_OOB (ParseArrayIndex (env, args[2 ], ts_obj_length - offset,
644
643
&max_length));
645
644
646
- max_length = MIN (ts_obj_length - offset, max_length);
645
+ max_length = std::min (ts_obj_length - offset, max_length);
647
646
648
647
if (max_length == 0 )
649
648
return args.GetReturnValue ().Set (0 );
@@ -712,9 +711,9 @@ void CompareOffset(const FunctionCallbackInfo<Value> &args) {
712
711
CHECK_LE (source_start, source_end);
713
712
CHECK_LE (target_start, target_end);
714
713
715
- size_t to_cmp = MIN ( MIN (source_end - source_start,
716
- target_end - target_start),
717
- ts_obj_length - source_start);
714
+ size_t to_cmp =
715
+ std::min ( std::min (source_end - source_start, target_end - target_start),
716
+ ts_obj_length - source_start);
718
717
719
718
int val = normalizeCompareVal (to_cmp > 0 ?
720
719
memcmp (ts_obj_data + source_start,
@@ -734,7 +733,7 @@ void Compare(const FunctionCallbackInfo<Value> &args) {
734
733
SPREAD_BUFFER_ARG (args[0 ], obj_a);
735
734
SPREAD_BUFFER_ARG (args[1 ], obj_b);
736
735
737
- size_t cmp_length = MIN (obj_a_length, obj_b_length);
736
+ size_t cmp_length = std::min (obj_a_length, obj_b_length);
738
737
739
738
int val = normalizeCompareVal (cmp_length > 0 ?
740
739
memcmp (obj_a_data, obj_b_data, cmp_length) : 0 ,
0 commit comments