Rolled out accidental commit.

        * platform/AtomicString.h:
        (WebCore::AtomicString::AtomicString):
        (WebCore::AtomicString::operator NSString*):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8bae3f51418da5a7e670eb7b7555162061968528..faf8d15744bee9fcc8a78f9e01ac5fb760c62ed8 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-29  Geoffrey Garen  <ggaren@apple.com>
+
+        Rolled out accidental commit.
+        
+        * platform/AtomicString.h:
+        (WebCore::AtomicString::AtomicString):
+        (WebCore::AtomicString::operator NSString*):
+
 2006-10-29  Geoffrey Garen  <ggaren@apple.com>
 
         RS by Darin.

diff --git a/WebCore/platform/AtomicString.h b/WebCore/platform/AtomicString.h
index c8ae10b50df559462abad4cc1051800baa08bd15..eeb2cea4318a7bdba89ef680968c510ff647b382 100644 (file)
--- a/WebCore/platform/AtomicString.h
+++ b/WebCore/platform/AtomicString.h
@@ -78,6 +78,11 @@ public:
 
     static void remove(StringImpl*);
     
+#ifdef __OBJC__
+    AtomicString(NSString* s) : m_string(add(String(s).impl())) { }
+    operator NSString*() const { return m_string; }
+#endif
+
     AtomicString(const DeprecatedString&);
     DeprecatedString deprecatedString() const;