Merge pull request #381 from fpistm/boolean

Replace boolean with standard bool

Author: fpistm

cores/arduino/WCharacter.h

@@ -28,19 +28,19 @@ extern "C" {
 
 // WCharacter.h prototypes
 #if defined (  __GNUC__  )
-inline boolean isAlphaNumeric(int c) __attribute__((always_inline));
-inline boolean isAlpha(int c) __attribute__((always_inline));
-inline boolean isAscii(int c) __attribute__((always_inline));
-inline boolean isWhitespace(int c) __attribute__((always_inline));
-inline boolean isControl(int c) __attribute__((always_inline));
-inline boolean isDigit(int c) __attribute__((always_inline));
-inline boolean isGraph(int c) __attribute__((always_inline));
-inline boolean isLowerCase(int c) __attribute__((always_inline));
-inline boolean isPrintable(int c) __attribute__((always_inline));
-inline boolean isPunct(int c) __attribute__((always_inline));
-inline boolean isSpace(int c) __attribute__((always_inline));
-inline boolean isUpperCase(int c) __attribute__((always_inline));
-inline boolean isHexadecimalDigit(int c) __attribute__((always_inline));
+inline bool isAlphaNumeric(int c) __attribute__((always_inline));
+inline bool isAlpha(int c) __attribute__((always_inline));
+inline bool isAscii(int c) __attribute__((always_inline));
+inline bool isWhitespace(int c) __attribute__((always_inline));
+inline bool isControl(int c) __attribute__((always_inline));
+inline bool isDigit(int c) __attribute__((always_inline));
+inline bool isGraph(int c) __attribute__((always_inline));
+inline bool isLowerCase(int c) __attribute__((always_inline));
+inline bool isPrintable(int c) __attribute__((always_inline));
+inline bool isPunct(int c) __attribute__((always_inline));
+inline bool isSpace(int c) __attribute__((always_inline));
+inline bool isUpperCase(int c) __attribute__((always_inline));
+inline bool isHexadecimalDigit(int c) __attribute__((always_inline));
 inline int toAscii(int c) __attribute__((always_inline));
 inline int toLowerCase(int c) __attribute__((always_inline));
 inline int toUpperCase(int c)__attribute__((always_inline));
@@ -49,74 +49,74 @@ inline int toUpperCase(int c)__attribute__((always_inline));
 
 // Checks for an alphanumeric character.
 // It is equivalent to (isalpha(c) || isdigit(c)).
-inline boolean isAlphaNumeric(int c)
+inline bool isAlphaNumeric(int c)
 {
   return ( isalnum(c) == 0 ? false : true);
 }
 
 
 // Checks for an alphabetic character.
 // It is equivalent to (isupper(c) || islower(c)).
-inline boolean isAlpha(int c)
+inline bool isAlpha(int c)
 {
   return ( isalpha(c) == 0 ? false : true);
 }
 
 
 // Checks whether c is a 7-bit unsigned char value
 // that fits into the ASCII character set.
-inline boolean isAscii(int c)
+inline bool isAscii(int c)
 {
 /*  return ( isascii(c) == 0 ? false : true); */
   return ( (c & ~0x7f) != 0 ? false : true);
 }
 
 
 // Checks for a blank character, that is, a space or a tab.
-inline boolean isWhitespace(int c)
+inline bool isWhitespace(int c)
 {
   return ( isblank (c) == 0 ? false : true);
 }
 
 
 // Checks for a control character.
-inline boolean isControl(int c)
+inline bool isControl(int c)
 {
   return ( iscntrl (c) == 0 ? false : true);
 }
 
 
 // Checks for a digit (0 through 9).
-inline boolean isDigit(int c)
+inline bool isDigit(int c)
 {
   return ( isdigit (c) == 0 ? false : true);
 }
 
 
 // Checks for any printable character except space.
-inline boolean isGraph(int c)
+inline bool isGraph(int c)
 {
   return ( isgraph (c) == 0 ? false : true);
 }
 
 
 // Checks for a lower-case character.
-inline boolean isLowerCase(int c)
+inline bool isLowerCase(int c)
 {
   return (islower (c) == 0 ? false : true);
 }
 
 
 // Checks for any printable character including space.
-inline boolean isPrintable(int c)
+inline bool isPrintable(int c)
 {
   return ( isprint (c) == 0 ? false : true);
 }
 
 
 // Checks for any printable character which is not a space
 // or an alphanumeric character.
-inline boolean isPunct(int c)
+inline bool isPunct(int c)
 {
   return ( ispunct (c) == 0 ? false : true);
 }
@@ -125,22 +125,22 @@ inline boolean isPunct(int c)
 // Checks for white-space characters. For the avr-libc library,
 // these are: space, formfeed ('\f'), newline ('\n'), carriage
 // return ('\r'), horizontal tab ('\t'), and vertical tab ('\v').
-inline boolean isSpace(int c)
+inline bool isSpace(int c)
 {
   return ( isspace (c) == 0 ? false : true);
 }
 
 
 // Checks for an uppercase letter.
-inline boolean isUpperCase(int c)
+inline bool isUpperCase(int c)
 {
   return ( isupper (c) == 0 ? false : true);
 }
 
 
 // Checks for a hexadecimal digits, i.e. one of 0 1 2 3 4 5 6 7
 // 8 9 a b c d e f A B C D E F.
-inline boolean isHexadecimalDigit(int c)
+inline bool isHexadecimalDigit(int c)
 {
   return ( isxdigit (c) == 0 ? false : true);
 }

cores/arduino/wiring_constants.h

@@ -107,7 +107,7 @@ enum BitOrder {
 
 typedef unsigned int word;
 
-typedef bool boolean ;
+typedef bool boolean __attribute__ ((deprecated));
 
 typedef uint8_t byte ;
 

libraries/Servo/src/stm32/Servo.cpp

@@ -89,7 +89,7 @@ static void finISR(stimer_t *obj)
   TimerPulseDeinit(obj);
 }
 
-static boolean isTimerActive(timer16_Sequence_t timer)
+static bool isTimerActive(timer16_Sequence_t timer)
 {
   // returns true if any servo is active on this timer
   for(uint8_t channel=0; channel < SERVOS_PER_TIMER; channel++) {