Skip to content

Commit 11b3e46

Browse files
committed
Fix Windows compiler warnings
1 parent 9d62b53 commit 11b3e46

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/njs/src/njsUtils.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ class RefCounter
143143
*/
144144
#define NJS_GET_CALLBACK( cb, args ) \
145145
{ \
146-
string msg; \
146+
string errMsg; \
147147
if( !args.Length() || !args[(args.Length()-1)]->IsFunction() ) \
148148
{ \
149-
msg = NJSMessages::getErrorMsg ( errMissingCallback ); \
150-
NJS_SET_EXCEPTION( msg.c_str(), msg.length() ); \
149+
errMsg = NJSMessages::getErrorMsg ( errMissingCallback ); \
150+
NJS_SET_EXCEPTION( errMsg.c_str(), errMsg.length() ); \
151151
args.GetReturnValue().SetUndefined(); \
152152
return; \
153153
} \
@@ -319,16 +319,16 @@ class RefCounter
319319
*/
320320
#define NJS_SET_PROP_STR( val, v8value, prop ) \
321321
{ \
322-
string msg; \
322+
string errMsg; \
323323
if( v8value->IsString() ) \
324324
{ \
325325
NJSString( val, v8value ); \
326326
} \
327327
else \
328328
{ \
329-
msg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
329+
errMsg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
330330
prop ); \
331-
NJS_SET_EXCEPTION( msg.c_str(), msg.length() ); \
331+
NJS_SET_EXCEPTION( errMsg.c_str(), errMsg.length() ); \
332332
} \
333333
}
334334

@@ -339,16 +339,16 @@ class RefCounter
339339
*/
340340
#define NJS_SET_PROP_UINT( val, v8value, prop ) \
341341
{ \
342-
string msg; \
342+
string errMsg; \
343343
if( v8value->IsUint32() ) \
344344
{ \
345345
val = v8value->ToUint32()->Value(); \
346346
} \
347347
else \
348348
{ \
349-
msg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
349+
errMsg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
350350
prop ); \
351-
NJS_SET_EXCEPTION( msg.c_str(), msg.length() ); \
351+
NJS_SET_EXCEPTION( errMsg.c_str(), errMsg.length() ); \
352352
} \
353353
}
354354

@@ -360,16 +360,16 @@ class RefCounter
360360
*/
361361
#define NJS_SET_PROP_DOUBLE( val, v8value, prop ) \
362362
{ \
363-
string msg; \
363+
string errMsg; \
364364
if( v8value->IsNUmber() ) \
365365
{ \
366366
val = v8value->ToNumber()->Value(); \
367367
} \
368368
else \
369369
{ \
370-
msg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
370+
errMsg = NJSMessages::getErrorMsg ( errInvalidPropertyValue, \
371371
prop ); \
372-
NJS_SET_EXCEPTION( msg.c_str(), msg.length() ); \
372+
NJS_SET_EXCEPTION( errMsg.c_str(), errMsg.length() ); \
373373
} \
374374
}
375375

@@ -392,7 +392,7 @@ class RefCounter
392392
*/
393393
#define NJS_CHECK_OBJECT_VALID( p ) \
394394
{ \
395-
if ( !p ) \
395+
if ( !p ) \
396396
{ \
397397
string error = NJSMessages::getErrorMsg ( errInvalidJSObject ); \
398398
NJS_SET_EXCEPTION(error.c_str(), error.length()); \
@@ -407,11 +407,11 @@ class RefCounter
407407
*/
408408
#define NJS_CHECK_OBJECT_VALID2( p, info ) \
409409
{ \
410-
if ( !p ) \
410+
if ( !p ) \
411411
{ \
412412
string error = NJSMessages::getErrorMsg ( errInvalidJSObject ); \
413413
NJS_SET_EXCEPTION(error.c_str(), error.length()); \
414-
info.GetReturnValue ().SetUndefined () ; \
414+
info.GetReturnValue ().SetUndefined () ; \
415415
return; \
416416
} \
417417
}

0 commit comments

Comments
 (0)