WTF: compile without collation

CLARKYJ · Nov 5, 2013 · 5f68a80 · 5f68a80
1 parent 17c4e89
commit 5f68a80
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/WTF/WTF.xcodeproj/project.pbxproj b/WTF/WTF.xcodeproj/project.pbxproj
@@ -1927,6 +1927,7 @@
  "$(GCC_PREPROCESSOR_DEFINITIONS)",
  TARGET_OS_IPHONE,
  "__MAC_OS_X_VERSION_MIN_REQUIRED=0",
+ "UCONFIG_NO_COLLATION=1",
  );
  IPHONEOS_DEPLOYMENT_TARGET = 5.1;
  PRODUCT_NAME = "WTF iOS";
@@ -1949,6 +1950,7 @@
  "$(GCC_PREPROCESSOR_DEFINITIONS)",
  TARGET_OS_IPHONE,
  "__MAC_OS_X_VERSION_MIN_REQUIRED=0",
+ "UCONFIG_NO_COLLATION=1",
  );
  IPHONEOS_DEPLOYMENT_TARGET = 5.1;
  PRODUCT_NAME = "WTF iOS";
@@ -1971,6 +1973,7 @@
  "$(GCC_PREPROCESSOR_DEFINITIONS)",
  TARGET_OS_IPHONE,
  "__MAC_OS_X_VERSION_MIN_REQUIRED=0",
+ "UCONFIG_NO_COLLATION=1",
  );
  IPHONEOS_DEPLOYMENT_TARGET = 5.1;
  PRODUCT_NAME = "WTF iOS";

diff --git a/WTF/wtf/unicode/Collator.h b/WTF/wtf/unicode/Collator.h
@@ -58,8 +58,11 @@ namespace WTF {
  void releaseCollator();
  mutable UCollator* m_collator;
 #endif
+
+#if !UCONFIG_NO_COLLATION
  char* m_locale;
  bool m_lowerFirst;
+#endif
  };
 }
 

diff --git a/WTF/wtf/unicode/CollatorDefault.cpp b/WTF/wtf/unicode/CollatorDefault.cpp
@@ -45,7 +45,8 @@ void Collator::setOrderLowerFirst(bool)
 {
 }
 
-OwnPtr<Collator> Collator::userDefault()
+//OwnPtr<Collator> Collator::userDefault() HACK
+std::unique_ptr<Collator> Collator::userDefault()
 {
  return std::make_unique<Collator>(nullptr);
 }