Skip to content

Commit 5f68a80

Browse files
committed
WTF: compile without collation
1 parent 17c4e89 commit 5f68a80

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

WTF/WTF.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,6 +1927,7 @@
19271927
"$(GCC_PREPROCESSOR_DEFINITIONS)",
19281928
TARGET_OS_IPHONE,
19291929
"__MAC_OS_X_VERSION_MIN_REQUIRED=0",
1930+
"UCONFIG_NO_COLLATION=1",
19301931
);
19311932
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
19321933
PRODUCT_NAME = "WTF iOS";
@@ -1949,6 +1950,7 @@
19491950
"$(GCC_PREPROCESSOR_DEFINITIONS)",
19501951
TARGET_OS_IPHONE,
19511952
"__MAC_OS_X_VERSION_MIN_REQUIRED=0",
1953+
"UCONFIG_NO_COLLATION=1",
19521954
);
19531955
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
19541956
PRODUCT_NAME = "WTF iOS";
@@ -1971,6 +1973,7 @@
19711973
"$(GCC_PREPROCESSOR_DEFINITIONS)",
19721974
TARGET_OS_IPHONE,
19731975
"__MAC_OS_X_VERSION_MIN_REQUIRED=0",
1976+
"UCONFIG_NO_COLLATION=1",
19741977
);
19751978
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
19761979
PRODUCT_NAME = "WTF iOS";

WTF/wtf/unicode/Collator.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,11 @@ namespace WTF {
5858
void releaseCollator();
5959
mutable UCollator* m_collator;
6060
#endif
61+
62+
#if !UCONFIG_NO_COLLATION
6163
char* m_locale;
6264
bool m_lowerFirst;
65+
#endif
6366
};
6467
}
6568

WTF/wtf/unicode/CollatorDefault.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ void Collator::setOrderLowerFirst(bool)
4545
{
4646
}
4747

48-
OwnPtr<Collator> Collator::userDefault()
48+
//OwnPtr<Collator> Collator::userDefault() HACK
49+
std::unique_ptr<Collator> Collator::userDefault()
4950
{
5051
return std::make_unique<Collator>(nullptr);
5152
}

0 commit comments

Comments
 (0)