ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #488 from sephiroth99/fixspec2 

ObjectTable: Remove explicit specialization in class scope
This commit is contained in:
Ben Vanik 2015-12-19 13:54:08 -08:00
parent 15816327b4 a281f6d70d
commit 82ddd0430f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/kernel/util/object_table.cc
View File

@ -202,6 +202,14 @@ ObjectTable::ObjectTableEntry* ObjectTable::LookupTable(X_HANDLE handle) {
return nullptr; return nullptr;
} }
// Generic lookup
template <>
object_ref<XObject> ObjectTable::LookupObject<XObject>(X_HANDLE handle) {
auto object = ObjectTable::LookupObject(handle, false);
auto result = object_ref<XObject>(reinterpret_cast<XObject*>(object));
return result;
}
XObject* ObjectTable::LookupObject(X_HANDLE handle, bool already_locked) { XObject* ObjectTable::LookupObject(X_HANDLE handle, bool already_locked) {
handle = TranslateHandle(handle); handle = TranslateHandle(handle);
if (!handle) { if (!handle) {

12
src/xenia/kernel/util/object_table.h
View File

@ -46,14 +46,6 @@ class ObjectTable {
return result; return result;
} }
// Generic lookup
template <>
object_ref<XObject> LookupObject<XObject>(X_HANDLE handle) {
auto object = LookupObject(handle, false);
auto result = object_ref<XObject>(reinterpret_cast<XObject*>(object));
return result;
}
X_STATUS AddNameMapping(const std::string& name, X_HANDLE handle); X_STATUS AddNameMapping(const std::string& name, X_HANDLE handle);
void RemoveNameMapping(const std::string& name); void RemoveNameMapping(const std::string& name);
X_STATUS GetObjectByName(const std::string& name, X_HANDLE* out_handle); X_STATUS GetObjectByName(const std::string& name, X_HANDLE* out_handle);
@ -86,6 +78,10 @@ class ObjectTable {
std::unordered_map<std::string, X_HANDLE> name_table_; std::unordered_map<std::string, X_HANDLE> name_table_;
}; };
// Generic lookup
template <>
object_ref<XObject> ObjectTable::LookupObject<XObject>(X_HANDLE handle);
} // namespace util } // namespace util
} // namespace kernel } // namespace kernel
} // namespace xe } // namespace xe