JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / wtf / unicode / Collator.h

diff --git a/wtf/unicode/Collator.h b/wtf/unicode/Collator.h
index f04779dd7d356150c17270e443b822ab26196ed5..00ab16e6a5bdba6ff14b5b371f1c914c1880382f 100644 (file)
--- a/wtf/unicode/Collator.h
+++ b/wtf/unicode/Collator.h
@@ -29,8 +29,9 @@
 #ifndef WTF_Collator_h
 #define WTF_Collator_h
 
-#include <memory>
+#include <wtf/FastAllocBase.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/PassOwnPtr.h>
 #include <wtf/unicode/Unicode.h>
 
 #if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
@@ -39,7 +40,8 @@ struct UCollator;
 
 namespace WTF {
 
-    class Collator : Noncopyable {
+    class Collator {
+        WTF_MAKE_NONCOPYABLE(Collator); WTF_MAKE_FAST_ALLOCATED;
     public:
         enum Result { Equal = 0, Greater = 1, Less = -1 };
 
@@ -47,7 +49,7 @@ namespace WTF {
         ~Collator();
         void setOrderLowerFirst(bool);
 
-        static std::auto_ptr<Collator> userDefault();
+        static PassOwnPtr<Collator> userDefault();
 
         Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const;