From fa97b332586a54f583e9784db3687c642d7801e7 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Mon, 4 Sep 2006 16:36:46 +0000 Subject: [PATCH] ICU-5304 Add missing namespace declarations. X-SVN-Rev: 20243 --- icu4c/source/i18n/gregoimp.cpp | 14 +++++++++----- icu4c/source/i18n/nfsubs.cpp | 6 +++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/icu4c/source/i18n/gregoimp.cpp b/icu4c/source/i18n/gregoimp.cpp index 0ebb654f870..407bdef92f0 100644 --- a/icu4c/source/i18n/gregoimp.cpp +++ b/icu4c/source/i18n/gregoimp.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2003-2005, International Business Machines +* Copyright (c) 2003-2006, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -17,6 +17,12 @@ #include "cstring.h" #include "uassert.h" +#if defined(U_DEBUG_CALDATA) +#include +#endif + +U_NAMESPACE_BEGIN + int32_t Math::floorDivide(int32_t numerator, int32_t denominator) { return (numerator >= 0) ? numerator / denominator : ((numerator + 1) / denominator) - 1; @@ -133,10 +139,6 @@ void Grego::dayToFields(double day, int32_t& year, int32_t& month, #define U_CALENDAR_DATA ((char*)0) -#if defined( U_DEBUG_CALDATA) -#include -#endif - // CalendarData::CalendarData(const Locale& loc, UErrorCode& status) // : fFillin(NULL), fBundle(NULL), fFallback(NULL) { // initData(loc.getBaseName(), (char*) "???", status); @@ -293,5 +295,7 @@ UResourceBundle* CalendarData::getByKey3(const char *key, const char *contextKey return fFillin; } +U_NAMESPACE_END + #endif //eof diff --git a/icu4c/source/i18n/nfsubs.cpp b/icu4c/source/i18n/nfsubs.cpp index 1c1185fdc56..b9e621b922c 100644 --- a/icu4c/source/i18n/nfsubs.cpp +++ b/icu4c/source/i18n/nfsubs.cpp @@ -1,6 +1,6 @@ /* ****************************************************************************** -* Copyright (C) 1997-2005, International Business Machines +* Copyright (C) 1997-2006, International Business Machines * Corporation and others. All Rights Reserved. ****************************************************************************** * file name: nfsubs.cpp @@ -41,6 +41,8 @@ static const UChar gGreaterGreaterThan[] = 0x3E, 0x3E, 0 }; /* ">>" */ +U_NAMESPACE_BEGIN + NFSubstitution* NFSubstitution::makeSubstitution(int32_t pos, const NFRule* rule, @@ -1076,6 +1078,8 @@ NullSubstitution::getDynamicClassID() const { return getStaticClassID(); } +U_NAMESPACE_END + /* U_HAVE_RBNF */ #endif