From 46f2eb82a51fd254f0b76a5cbb9ae8c9b3a0c1fa Mon Sep 17 00:00:00 2001 From: Edwin Smith Date: Tue, 9 Jul 2013 10:28:03 -0700 Subject: [PATCH] Delete some dead code in NameValueTableWrapper and SharedMap --- hphp/runtime/base/shared/shared_map.cpp | 5 ----- hphp/runtime/vm/name_value_table_wrapper.cpp | 4 ---- hphp/runtime/vm/name_value_table_wrapper.h | 1 - 3 files changed, 10 deletions(-) diff --git a/hphp/runtime/base/shared/shared_map.cpp b/hphp/runtime/base/shared/shared_map.cpp index ed9cd120b..45fa4d0f3 100644 --- a/hphp/runtime/base/shared/shared_map.cpp +++ b/hphp/runtime/base/shared/shared_map.cpp @@ -84,11 +84,6 @@ bool SharedMap::exists(const StringData* k) const { bool SharedMap::exists(int64_t k) const { return getIndex(k) != -1; - if (isVector()) { - if (k < 0 || (size_t)k >= m_vec->m_size) return false; - return true; - } - return m_map->indexOf(k) != -1; } /* if a2 is modified copy of a1 (i.e. != a1), then release a1 and return a2 */ diff --git a/hphp/runtime/vm/name_value_table_wrapper.cpp b/hphp/runtime/vm/name_value_table_wrapper.cpp index 3d1f1a5a6..d7e6adff2 100644 --- a/hphp/runtime/vm/name_value_table_wrapper.cpp +++ b/hphp/runtime/vm/name_value_table_wrapper.cpp @@ -67,10 +67,6 @@ bool NameValueTableWrapper::exists(const StringData* k) const { return m_tab->lookup(k); } -bool NameValueTableWrapper::idxExists(ssize_t idx) const { - return false; -} - TypedValue* NameValueTableWrapper::nvGet(const StringData* k) const { return m_tab->lookup(k); } diff --git a/hphp/runtime/vm/name_value_table_wrapper.h b/hphp/runtime/vm/name_value_table_wrapper.h index 312ea108b..5ae978f06 100644 --- a/hphp/runtime/vm/name_value_table_wrapper.h +++ b/hphp/runtime/vm/name_value_table_wrapper.h @@ -83,7 +83,6 @@ public: // ArrayData implementation virtual bool exists(int64_t k) const; virtual bool exists(const StringData* k) const; - virtual bool idxExists(ssize_t idx) const; virtual TypedValue* nvGet(int64_t k) const; virtual TypedValue* nvGet(const StringData* k) const;