|
27 | 27 | /* Constructors*/ |
28 | 28 | /*********************************************/ |
29 | 29 |
|
30 | | -usingnamespacearduino; |
| 30 | +namespacearduino { |
31 | 31 |
|
32 | 32 | String::String(constchar *cstr) |
33 | 33 | { |
@@ -354,77 +354,77 @@ unsigned char String::concat(const __FlashStringHelper * str) |
354 | 354 | /* Concatenate*/ |
355 | 355 | /*********************************************/ |
356 | 356 |
|
357 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,const String &rhs) |
| 357 | +StringSumHelper &operator + (const StringSumHelper &lhs,const String &rhs) |
358 | 358 | { |
359 | 359 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
360 | 360 | if (!a.concat(rhs.buffer, rhs.len)) a.invalidate(); |
361 | 361 | return a; |
362 | 362 | } |
363 | 363 |
|
364 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,constchar *cstr) |
| 364 | +StringSumHelper &operator + (const StringSumHelper &lhs,constchar *cstr) |
365 | 365 | { |
366 | 366 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
367 | 367 | if (!cstr || !a.concat(cstr,strlen(cstr))) a.invalidate(); |
368 | 368 | return a; |
369 | 369 | } |
370 | 370 |
|
371 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,char c) |
| 371 | +StringSumHelper &operator + (const StringSumHelper &lhs,char c) |
372 | 372 | { |
373 | 373 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
374 | 374 | if (!a.concat(c)) a.invalidate(); |
375 | 375 | return a; |
376 | 376 | } |
377 | 377 |
|
378 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,unsignedchar num) |
| 378 | +StringSumHelper &operator + (const StringSumHelper &lhs,unsignedchar num) |
379 | 379 | { |
380 | 380 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
381 | 381 | if (!a.concat(num)) a.invalidate(); |
382 | 382 | return a; |
383 | 383 | } |
384 | 384 |
|
385 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,int num) |
| 385 | +StringSumHelper &operator + (const StringSumHelper &lhs,int num) |
386 | 386 | { |
387 | 387 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
388 | 388 | if (!a.concat(num)) a.invalidate(); |
389 | 389 | return a; |
390 | 390 | } |
391 | 391 |
|
392 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,unsignedint num) |
| 392 | +StringSumHelper &operator + (const StringSumHelper &lhs,unsignedint num) |
393 | 393 | { |
394 | 394 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
395 | 395 | if (!a.concat(num)) a.invalidate(); |
396 | 396 | return a; |
397 | 397 | } |
398 | 398 |
|
399 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,long num) |
| 399 | +StringSumHelper &operator + (const StringSumHelper &lhs,long num) |
400 | 400 | { |
401 | 401 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
402 | 402 | if (!a.concat(num)) a.invalidate(); |
403 | 403 | return a; |
404 | 404 | } |
405 | 405 |
|
406 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,unsignedlong num) |
| 406 | +StringSumHelper &operator + (const StringSumHelper &lhs,unsignedlong num) |
407 | 407 | { |
408 | 408 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
409 | 409 | if (!a.concat(num)) a.invalidate(); |
410 | 410 | return a; |
411 | 411 | } |
412 | 412 |
|
413 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,float num) |
| 413 | +StringSumHelper &operator + (const StringSumHelper &lhs,float num) |
414 | 414 | { |
415 | 415 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
416 | 416 | if (!a.concat(num)) a.invalidate(); |
417 | 417 | return a; |
418 | 418 | } |
419 | 419 |
|
420 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,double num) |
| 420 | +StringSumHelper &operator + (const StringSumHelper &lhs,double num) |
421 | 421 | { |
422 | 422 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
423 | 423 | if (!a.concat(num)) a.invalidate(); |
424 | 424 | return a; |
425 | 425 | } |
426 | 426 |
|
427 | | -StringSumHelper &arduino::operator + (const StringSumHelper &lhs,const __FlashStringHelper *rhs) |
| 427 | +StringSumHelper &operator + (const StringSumHelper &lhs,const __FlashStringHelper *rhs) |
428 | 428 | { |
429 | 429 | StringSumHelper &a =const_cast<StringSumHelper&>(lhs); |
430 | 430 | if (!a.concat(rhs))a.invalidate(); |
@@ -742,3 +742,5 @@ double String::toDouble(void) const |
742 | 742 | if (buffer)returnatof(buffer); |
743 | 743 | return0; |
744 | 744 | } |
| 745 | + |
| 746 | +}// namespace arduino |