summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ellis <matell@microsoft.com>2015-10-20 22:18:29 -0700
committerMatt Ellis <matell@microsoft.com>2015-10-21 13:49:01 -0700
commitb3efdce6526c351589f2262d655d9739519aed8f (patch)
tree1224fddd25ecfb0a84bcf79b76b0753dd433b5e3
parent0b3b276ea837e3ae9720e72142fe5c0ae54ad5a3 (diff)
downloadcoreclr-b3efdce6526c351589f2262d655d9739519aed8f.tar.gz
coreclr-b3efdce6526c351589f2262d655d9739519aed8f.tar.bz2
coreclr-b3efdce6526c351589f2262d655d9739519aed8f.zip
Cleanup include directives
-rw-r--r--src/corefx/System.Globalization.Native/calendarData.cpp5
-rw-r--r--src/corefx/System.Globalization.Native/holders.h14
-rw-r--r--src/corefx/System.Globalization.Native/locale.cpp5
-rw-r--r--src/corefx/System.Globalization.Native/localeNumberData.cpp8
-rw-r--r--src/corefx/System.Globalization.Native/localeStringData.cpp5
5 files changed, 9 insertions, 28 deletions
diff --git a/src/corefx/System.Globalization.Native/calendarData.cpp b/src/corefx/System.Globalization.Native/calendarData.cpp
index 744f4528f8..54fd471d71 100644
--- a/src/corefx/System.Globalization.Native/calendarData.cpp
+++ b/src/corefx/System.Globalization.Native/calendarData.cpp
@@ -10,11 +10,6 @@
#include "locale.hpp"
#include "holders.h"
-#include <unicode/dtfmtsym.h>
-#include <unicode/smpdtfmt.h>
-#include <unicode/dtptngen.h>
-#include <unicode/locdspnm.h>
-
#define GREGORIAN_NAME "gregorian"
#define JAPANESE_NAME "japanese"
#define BUDDHIST_NAME "buddhist"
diff --git a/src/corefx/System.Globalization.Native/holders.h b/src/corefx/System.Globalization.Native/holders.h
index f0d5550a80..3e081893f4 100644
--- a/src/corefx/System.Globalization.Native/holders.h
+++ b/src/corefx/System.Globalization.Native/holders.h
@@ -3,13 +3,13 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
//
-#include "unicode/ucal.h"
-#include "unicode/uenum.h"
-#include "unicode/udatpg.h"
-#include "unicode/udat.h"
-#include "unicode/unum.h"
-#include "unicode/uldnames.h"
-#include "unicode/ures.h"
+#include <unicode/ucal.h>
+#include <unicode/uenum.h>
+#include <unicode/udatpg.h>
+#include <unicode/udat.h>
+#include <unicode/unum.h>
+#include <unicode/uldnames.h>
+#include <unicode/ures.h>
// IcuHolder is a template that can manage the lifetime of a raw pointer to ensure that it is cleaned up at the correct
// time. The general usage pattern is to aquire some ICU resource via an _open call, then construct a holder using the
diff --git a/src/corefx/System.Globalization.Native/locale.cpp b/src/corefx/System.Globalization.Native/locale.cpp
index c8a78f86e4..6ae699a107 100644
--- a/src/corefx/System.Globalization.Native/locale.cpp
+++ b/src/corefx/System.Globalization.Native/locale.cpp
@@ -10,11 +10,6 @@
#include "locale.hpp"
-#include "unicode/dcfmtsym.h" //decimal
-#include "unicode/dtfmtsym.h" //date
-#include "unicode/localpointer.h"
-#include "unicode/ulocdata.h"
-
int32_t UErrorCodeToBool(UErrorCode status)
{
if (U_SUCCESS(status))
diff --git a/src/corefx/System.Globalization.Native/localeNumberData.cpp b/src/corefx/System.Globalization.Native/localeNumberData.cpp
index 842bcffac2..b7bb95a48c 100644
--- a/src/corefx/System.Globalization.Native/localeNumberData.cpp
+++ b/src/corefx/System.Globalization.Native/localeNumberData.cpp
@@ -8,15 +8,11 @@
#include <string.h>
#include <vector>
+#include <unicode/ulocdata.h>
+
#include "locale.hpp"
#include "holders.h"
-#include "unicode/calendar.h"
-#include "unicode/decimfmt.h"
-#include "unicode/localpointer.h"
-#include "unicode/numfmt.h"
-#include "unicode/ulocdata.h"
-
// invariant character definitions used by ICU
#define UCHAR_CURRENCY ((UChar)0x00A4) // international currency
#define UCHAR_SPACE ((UChar)0x0020) // space
diff --git a/src/corefx/System.Globalization.Native/localeStringData.cpp b/src/corefx/System.Globalization.Native/localeStringData.cpp
index 6c7942f97c..8e115129c2 100644
--- a/src/corefx/System.Globalization.Native/localeStringData.cpp
+++ b/src/corefx/System.Globalization.Native/localeStringData.cpp
@@ -11,11 +11,6 @@
#include "locale.hpp"
#include "holders.h"
-#include "unicode/dcfmtsym.h" //decimal symbols
-#include "unicode/dtfmtsym.h" //date symbols
-#include "unicode/smpdtfmt.h" //date format
-#include "unicode/localpointer.h"
-
// Enum that corresponds to managed enum CultureData.LocaleStringData.
// The numeric values of the enum members match their Win32 counterparts.
enum LocaleStringData : int32_t