Improve C++ stubs for locales

Author: lcartey

cpp/common/test/includes/standard-library/clocale

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef _GHLIBCPP_CLOCALE
+#define _GHLIBCPP_CLOCALE
 
 #define NULL 0
 #define LC_ALL 0
@@ -15,3 +16,5 @@ using ::lconv;
 using ::localeconv;
 using ::setlocale;
 } // namespace std
+
+#endif // _GHLIBCPP_CLOCALE

cpp/common/test/includes/standard-library/locale

@@ -0,0 +1,25 @@
+
+#ifndef _GHLIBCPP_LOCALE
+#define _GHLIBCPP_LOCALE
+
+namespace std {
+
+class locale {};
+
+template <class charT> bool isspace(charT c, const locale &loc);
+template <class charT> bool isprint(charT c, const locale &loc);
+template <class charT> bool iscntrl(charT c, const locale &loc);
+template <class charT> bool isupper(charT c, const locale &loc);
+template <class charT> bool islower(charT c, const locale &loc);
+template <class charT> bool isalpha(charT c, const locale &loc);
+template <class charT> bool isdigit(charT c, const locale &loc);
+template <class charT> bool ispunct(charT c, const locale &loc);
+template <class charT> bool isxdigit(charT c, const locale &loc);
+template <class charT> bool isalnum(charT c, const locale &loc);
+template <class charT> bool isgraph(charT c, const locale &loc);
+template <class charT> bool isblank(charT c, const locale &loc);
+template <class charT> charT toupper(charT c, const locale &loc);
+template <class charT> charT tolower(charT c, const locale &loc);
+} // namespace std
+
+#endif // _GHLIBCPP_LOCALE

cpp/common/test/includes/standard-library/locale.h

@@ -1,38 +1,37 @@
-#ifndef _GHLIBCPP_LOCALE
-#define _GHLIBCPP_LOCALE
+#ifndef _GHLIBCPP_LOCALE_H
+#define _GHLIBCPP_LOCALE_H
 
-#define LC_ALL      6
+#define LC_ALL 6
 
 struct lconv {
-	char *decimal_point;
-	char *thousands_sep;
-	char *grouping;
+  char *decimal_point;
+  char *thousands_sep;
+  char *grouping;
 
-	char *int_curr_symbol;
-	char *currency_symbol;
-	char *mon_decimal_point;
-	char *mon_thousands_sep;
-	char *mon_grouping;
-	char *positive_sign;
-	char *negative_sign;
-	char int_frac_digits;
-	char frac_digits;
-	char p_cs_precedes;
-	char p_sep_by_space;
-	char n_cs_precedes;
-	char n_sep_by_space;
-	char p_sign_posn;
-	char n_sign_posn;
-	char int_p_cs_precedes;
-	char int_p_sep_by_space;
-	char int_n_cs_precedes;
-	char int_n_sep_by_space;
-	char int_p_sign_posn;
-	char int_n_sign_posn;
+  char *int_curr_symbol;
+  char *currency_symbol;
+  char *mon_decimal_point;
+  char *mon_thousands_sep;
+  char *mon_grouping;
+  char *positive_sign;
+  char *negative_sign;
+  char int_frac_digits;
+  char frac_digits;
+  char p_cs_precedes;
+  char p_sep_by_space;
+  char n_cs_precedes;
+  char n_sep_by_space;
+  char p_sign_posn;
+  char n_sign_posn;
+  char int_p_cs_precedes;
+  char int_p_sep_by_space;
+  char int_n_cs_precedes;
+  char int_n_sep_by_space;
+  char int_p_sign_posn;
+  char int_n_sign_posn;
 };
 
-
-char *setlocale (int, const char *);
+char *setlocale(int, const char *);
 struct lconv *localeconv(void);
 
-#endif // _GHLIBCPP_LOCALE
+#endif // _GHLIBCPP_LOCALE_H