Author: zooey Date: 2010-07-07 18:42:51 +0200 (Wed, 07 Jul 2010) New Revision: 37418 Changeset: http://dev.haiku-os.org/changeset/37418/haiku Modified: haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICUCategoryData.h haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICULocaleconvData.h haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCategoryData.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCollateData.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCtypeData.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleBackend.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleconvData.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMonetaryData.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUNumericData.cpp haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUTimeData.cpp Log: * fix build with gcc4 * removed some superfluous inclusions of <new> Modified: haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICUCategoryData.h =================================================================== --- haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICUCategoryData.h 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICUCategoryData.h 2010-07-07 16:42:51 UTC (rev 37418) @@ -32,7 +32,7 @@ status_t _ConvertUnicodeStringToLocaleconvEntry( const UnicodeString& string, char* destination, int destinationSize, - char* defaultValue = ""); + const char* defaultValue = ""); static const uint16 skMaxPosixLocaleNameLen = 128; static const size_t skLCBufSize = 16; Modified: haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICULocaleconvData.h =================================================================== --- haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICULocaleconvData.h 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/headers/private/libroot/locale/ICULocaleconvData.h 2010-07-07 16:42:51 UTC (rev 37418) @@ -23,7 +23,7 @@ status_t _SetLocaleconvEntry( const DecimalFormatSymbols* formatSymbols, char* destination, FormatSymbol symbol, - char* defaultValue = ""); + const char* defaultValue = ""); }; Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCategoryData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCategoryData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCategoryData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,8 +6,6 @@ #include "ICUCategoryData.h" -#include <new> - #include <string.h> #include <unicode/uchar.h> @@ -104,7 +102,7 @@ status_t ICUCategoryData::_ConvertUnicodeStringToLocaleconvEntry( const UnicodeString& string, char* destination, int destinationSize, - char* defaultValue) + const char* defaultValue) { status_t result = B_OK; UErrorCode icuStatus = U_ZERO_ERROR; Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCollateData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCollateData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCollateData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,9 +6,7 @@ #include "ICUCollateData.h" -#include <new> - namespace BPrivate { Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCtypeData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCtypeData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUCtypeData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,8 +6,6 @@ #include "ICUCtypeData.h" -#include <new> - #include <string.h> #include <unicode/uchar.h> Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleBackend.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleBackend.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleBackend.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -8,7 +8,6 @@ #include <new> -#include <limits.h> #include <locale.h> #include <string.h> Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleconvData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleconvData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICULocaleconvData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,8 +6,6 @@ #include "ICULocaleconvData.h" -#include <new> - #include <string.h> @@ -16,7 +14,7 @@ status_t ICULocaleconvData::_SetLocaleconvEntry(const DecimalFormatSymbols* formatSymbols, - char* destination, FormatSymbol symbol, char* defaultValue) + char* destination, FormatSymbol symbol, const char* defaultValue) { status_t result = B_OK; Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMessagesData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,9 +6,7 @@ #include "ICUMessagesData.h" -#include <new> - namespace BPrivate { Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMonetaryData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMonetaryData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUMonetaryData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,9 +6,8 @@ #include "ICUMonetaryData.h" -#include <new> - #include <limits.h> +#include <strings.h> #include <PosixLocaleConv.h> Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUNumericData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUNumericData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUNumericData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,7 +6,7 @@ #include "ICUNumericData.h" -#include <new> +#include <strings.h> #include <PosixLocaleConv.h> Modified: haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUTimeData.cpp =================================================================== --- haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUTimeData.cpp 2010-07-07 16:20:42 UTC (rev 37417) +++ haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/locale/ICUTimeData.cpp 2010-07-07 16:42:51 UTC (rev 37418) @@ -6,7 +6,7 @@ #include "ICUTimeData.h" -#include <new> +#include <strings.h> #include <unicode/dtfmtsym.h> #include <unicode/smpdtfmt.h>