diff options
| author | Petr Mrázek | 2011-12-24 14:27:58 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2011-12-24 14:27:58 +0100 |
| commit | e9f9f9b92e5b58bcffbf1ba26e926e5a7a609bed (patch) | |
| tree | 44e45300ed18e6ba087600ec49add09680a7eff7 /library/DataDefs.cpp | |
| parent | 59c32b1ee979d6264bd0ae9803b6600311d1dee8 (diff) | |
| parent | 2eb56d0480d4c30217ff53092f4331cb35881031 (diff) | |
| download | dfhack-e9f9f9b92e5b58bcffbf1ba26e926e5a7a609bed.tar.gz dfhack-e9f9f9b92e5b58bcffbf1ba26e926e5a7a609bed.tar.bz2 dfhack-e9f9f9b92e5b58bcffbf1ba26e926e5a7a609bed.tar.xz | |
Merge https://github.com/angavrilov/dfhack
Diffstat (limited to 'library/DataDefs.cpp')
| -rw-r--r-- | library/DataDefs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp index 7b4af847..2f1f9c23 100644 --- a/library/DataDefs.cpp +++ b/library/DataDefs.cpp @@ -56,7 +56,7 @@ virtual_identity::virtual_identity(const char *dfhack_name, const char *original static tthread::mutex *known_mutex = NULL; std::map<void*, virtual_identity*> virtual_identity::known; -virtual_identity *virtual_identity::get(virtual_class *instance_ptr) +virtual_identity *virtual_identity::get(virtual_ptr instance_ptr) { if (!instance_ptr) return NULL; @@ -87,7 +87,7 @@ virtual_identity *virtual_identity::get(virtual_class *instance_ptr) return NULL; } -bool virtual_identity::check_instance(virtual_class *instance_ptr, bool allow_subclasses) +bool virtual_identity::check_instance(virtual_ptr instance_ptr, bool allow_subclasses) { virtual_identity *actual = get(instance_ptr); |
