5706 2005-11-10 20:13:26 -0800 Sharedptr dependency can be removed 2005-12-19 14:10:06 -0800 1 1 1 Unclassified WebKit JavaScriptCore 420+ Other Linux RESOLVED FIXED P4 Normal --- 1 staikos mjs oldest_to_newest 23913 0 staikos 2005-11-10 20:13:26 -0800 SharedPtr doesn't compile on its own. It would need includes for NULL. This causes failures in some configurations. A better solution in my opinion is to change NULL to 0: @@ -29,7 +29,7 @@ template <class T> class SharedPtr { public: - SharedPtr() : m_ptr(NULL) {} + SharedPtr() : m_ptr(0) {} SharedPtr(T *ptr) : m_ptr(ptr) { if (ptr) ptr->ref(); } SharedPtr(const SharedPtr &o) : m_ptr(o.m_ptr) { if (T *ptr = m_ptr) ptr->ref(); } ~SharedPtr() { if (T *ptr = m_ptr) ptr->deref(); } @@ -37,11 +37,11 @@ template <class U> SharedPtr(const SharedPtr<U> &o) : m_ptr(o.get()) { if (T *ptr = m_ptr) ptr->ref(); } // FIXME: Deprecate in favor of operators below, then remove? - bool isNull() const { return m_ptr == NULL; } - bool notNull() const { return m_ptr != NULL; } + bool isNull() const { return m_ptr == 0; } + bool notNull() const { return m_ptr != 0; } // FIXME: Deprecate in favor of operator=, then remove? - void reset() { if (T *ptr = m_ptr) ptr->deref(); m_ptr = NULL; } + void reset() { if (T *ptr = m_ptr) ptr->deref(); m_ptr = 0; } void reset(T *o) { if (o) o->ref(); if (T *ptr = m_ptr) ptr->deref(); m_ptr = o; } T *get() const { return m_ptr; } @@ -49,8 +49,8 @@ T &operator*() const { return *m_ptr; } T *operator->() const { return m_ptr; } - bool operator!() const { return m_ptr == NULL; } - operator bool() const { return m_ptr != NULL; } + bool operator!() const { return m_ptr == 0; } + operator bool() const { return m_ptr != 0; } SharedPtr &operator=(const SharedPtr &); SharedPtr &operator=(T *); 26180 1 5151 ap 2005-12-19 06:31:23 -0800 Created attachment 5151 Remove NULL from RefPtr and PassRefPtr 26182 2 5151 darin 2005-12-19 08:49:28 -0800 Comment on attachment 5151 Remove NULL from RefPtr and PassRefPtr Good idea. I had put this in my local copy already. Although for operator! I think that !m_ptr is even better than m_ptr == 0. r=me 5151 2005-12-19 06:31:23 -0800 2005-12-19 08:49:28 -0800 Remove NULL from RefPtr and PassRefPtr NoNULLPatch.txt text/plain 1917 ap SW5kZXg6IFBhc3NSZWZQdHIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvSmF2YVNj cmlwdENvcmUva3htbGNvcmUvUGFzc1JlZlB0ci5oLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjMK ZGlmZiAtcCAtdSAtcjEuMyBQYXNzUmVmUHRyLmgKLS0tIFBhc3NSZWZQdHIuaAk4IERlYyAyMDA1 IDE4OjE5OjI4IC0wMDAwCTEuMworKysgUGFzc1JlZlB0ci5oCTE5IERlYyAyMDA1IDE0OjM3OjMx IC0wMDAwCkBAIC00MSw3ICs0MSw3IEBAIG5hbWVzcGFjZSBLWE1MQ29yZSB7CiAgICAgY2xhc3Mg UGFzc1JlZlB0cgogICAgIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIFBhc3NSZWZQdHIoKSA6IG1f cHRyKE5VTEwpIHt9CisgICAgICAgIFBhc3NSZWZQdHIoKSA6IG1fcHRyKDApIHt9CiAgICAgICAg IFBhc3NSZWZQdHIoVCAqcHRyKSA6IG1fcHRyKHB0cikgeyBpZiAocHRyKSBwdHItPnJlZigpOyB9 CiAgICAgICAgIFBhc3NSZWZQdHIoY29uc3QgUmVmUHRyPFQ+JiBvKSA6IG1fcHRyKG8uZ2V0KCkp IHsgaWYgKFQgKnB0ciA9IG1fcHRyKSBwdHItPnJlZigpOyB9CiAKQEAgLTY0LDcgKzY0LDcgQEAg bmFtZXNwYWNlIEtYTUxDb3JlIHsKICAgICAgICAgVCYgb3BlcmF0b3IqKCkgY29uc3QgeyByZXR1 cm4gKm1fcHRyOyB9CiAgICAgICAgIFQgKm9wZXJhdG9yLT4oKSBjb25zdCB7IHJldHVybiBtX3B0 cjsgfQogICAgICAgICAKLSAgICAgICAgYm9vbCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiBt X3B0ciA9PSBOVUxMOyB9CisgICAgICAgIGJvb2wgb3BlcmF0b3IhKCkgY29uc3QgeyByZXR1cm4g bV9wdHIgPT0gMDsgfQogCiAgICAgICAgIC8vIHRoaXMgdHlwZSBjb252ZXJzaW9uIG9wZXJhdG9y IGFsbG93cyBpbXBsaWNpdCBjb252ZXJzaW9uIHRvCiAgICAgICAgIC8vIGJvb2wgYnV0IG5vdCB0 byBvdGhlciBpbnRlZ2VyIHR5cGVzCkluZGV4OiBSZWZQdHIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxl OiAvY3ZzL3Jvb3QvSmF2YVNjcmlwdENvcmUva3htbGNvcmUvUmVmUHRyLmgsdgpyZXRyaWV2aW5n IHJldmlzaW9uIDEuNQpkaWZmIC1wIC11IC1yMS41IFJlZlB0ci5oCi0tLSBSZWZQdHIuaAkxNiBE ZWMgMjAwNSAyMjoyNzoyNiAtMDAwMAkxLjUKKysrIFJlZlB0ci5oCTE5IERlYyAyMDA1IDE0OjM3 OjM4IC0wMDAwCkBAIC0zMSw3ICszMSw3IEBAIG5hbWVzcGFjZSBLWE1MQ29yZSB7CiAgICAgdGVt cGxhdGUgPGNsYXNzIFQ+IGNsYXNzIFJlZlB0cgogICAgIHsKICAgICBwdWJsaWM6Ci0gICAgICAg IFJlZlB0cigpIDogbV9wdHIoTlVMTCkge30KKyAgICAgICAgUmVmUHRyKCkgOiBtX3B0cigwKSB7 fQogICAgICAgICBSZWZQdHIoVCAqcHRyKSA6IG1fcHRyKHB0cikgeyBpZiAocHRyKSBwdHItPnJl ZigpOyB9CiAgICAgICAgIFJlZlB0cihjb25zdCBSZWZQdHImIG8pIDogbV9wdHIoby5tX3B0cikg eyBpZiAoVCAqcHRyID0gbV9wdHIpIHB0ci0+cmVmKCk7IH0KIApAQCAtNDQsNyArNDQsNyBAQCBu YW1lc3BhY2UgS1hNTENvcmUgewogICAgICAgICBUJiBvcGVyYXRvciooKSBjb25zdCB7IHJldHVy biAqbV9wdHI7IH0KICAgICAgICAgVCAqb3BlcmF0b3ItPigpIGNvbnN0IHsgcmV0dXJuIG1fcHRy OyB9CiAgICAgICAgIAotICAgICAgICBib29sIG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0dXJuIG1f cHRyID09IE5VTEw7IH0KKyAgICAgICAgYm9vbCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiBt X3B0ciA9PSAwOyB9CiAKICAgICAKICAgICAgICAgLy8gdGhpcyB0eXBlIGNvbnZlcnNpb24gb3Bl cmF0b3IgYWxsb3dzIGltcGxpY2l0IGNvbnZlcnNpb24gdG8K