Merge branch 'master' into patch-1

2 files changed, 3 insertions, 12 deletions

diff --git a/libraries/EEPROM/src/EEPROM.h b/libraries/EEPROM/src/EEPROM.h
index cde75db..c8ec271 100644
--- a/libraries/EEPROM/src/EEPROM.h
+++ b/libraries/EEPROM/src/EEPROM.h
@@ -40,7 +40,7 @@ struct EERef{
     
     //Access/read members.
     uint8_t operator*() const            { return eeprom_read_byte( (uint8_t*) index ); }
-    operator const uint8_t() const       { return **this; }
+    operator uint8_t() const             { return **this; }
     
     //Assignment/write members.
     EERef &operator=( const EERef &ref ) { return *this = *ref; }
@@ -89,7 +89,7 @@ struct EEPtr{
     EEPtr( const int index )
         : index( index )                {}
         
-    operator const int() const          { return index; }
+    operator int() const                { return index; }
     EEPtr &operator=( int in )          { return index = in, *this; }
     
     //Iterator functionality.
@@ -143,4 +143,4 @@ struct EEPROMClass{
 };
 
 static EEPROMClass EEPROM;
-#endif
\ No newline at end of file
+#endif
diff --git a/libraries/SoftwareSerial/src/SoftwareSerial.h b/libraries/SoftwareSerial/src/SoftwareSerial.h
index b1a37c4..d8b88ce 100644
--- a/libraries/SoftwareSerial/src/SoftwareSerial.h
+++ b/libraries/SoftwareSerial/src/SoftwareSerial.h
@@ -111,13 +111,4 @@ public:
   static inline void handle_interrupt() __attribute__((__always_inline__));

 };

 

-// Arduino 0012 workaround

-#undef int

-#undef char

-#undef long

-#undef byte

-#undef float

-#undef abs

-#undef round

-

 #endif