updates

Dependencies:   BLE_API mbed-dev-bin nRF51822

Fork of microbit-dal-eddystone by Martin Woolley

Files at this revision

API Documentation at this revision

Comitter:
LancasterUniversity
Date:
Wed Jul 13 12:18:30 2016 +0100
Parent:
50:6dde288fb262
Child:
52:3db7b4d64316
Commit message:
Synchronized with git rev d8c083d4
Author: Brendan Moran
Add missing const qualifier from add operator

This change permits more friendly use of the type such as:

```C++
ManagedString s = "A";
ManagedString b = s + ", " + 2;
```

Changed in this revision

inc/types/ManagedString.h Show annotated file Show diff for this revision Revisions of this file
source/types/ManagedString.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/inc/types/ManagedString.h	Wed Jul 13 12:18:29 2016 +0100
+++ b/inc/types/ManagedString.h	Wed Jul 13 12:18:30 2016 +0100
@@ -314,7 +314,7 @@
       * display.scroll(s + p) // scrolls "abcdefgh"
       * @endcode
       */
-    ManagedString operator+ (ManagedString& s);
+    ManagedString operator+ (const ManagedString& s);
 
     /**
       * Provides a character value at a given position in the string, indexed from zero.
@@ -396,4 +396,4 @@
 
 };
 
-#endif
+#endif
\ No newline at end of file
--- a/source/types/ManagedString.cpp	Wed Jul 13 12:18:29 2016 +0100
+++ b/source/types/ManagedString.cpp	Wed Jul 13 12:18:30 2016 +0100
@@ -451,7 +451,7 @@
   * display.scroll(s + p) // scrolls "abcdefgh"
   * @endcode
   */
-ManagedString ManagedString::operator+ (ManagedString& s)
+ManagedString ManagedString::operator+ (const ManagedString& s)
 {
     // If the other string is empty, nothing to do!
     if(s.length() == 0)
@@ -486,4 +486,4 @@
 /**
   * Empty string constant literal
   */
-ManagedString ManagedString::EmptyString((StringData*)(void*)empty);
+ManagedString ManagedString::EmptyString((StringData*)(void*)empty);
\ No newline at end of file