git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:thepowersgang/acess2
[tpg/acess2.git]
/
Usermode
/
Libraries
/
libc++.so_src
/
typeinfo.cc
diff --git
a/Usermode/Libraries/libc++.so_src/typeinfo.cc
b/Usermode/Libraries/libc++.so_src/typeinfo.cc
index
993df3c
..
31907ee
100644
(file)
--- a/
Usermode/Libraries/libc++.so_src/typeinfo.cc
+++ b/
Usermode/Libraries/libc++.so_src/typeinfo.cc
@@
-47,6
+47,7
@@
type_info::type_info(const type_info& rhs):
}
type_info& type_info::operator=(const type_info& rhs)
{
}
type_info& type_info::operator=(const type_info& rhs)
{
+ _SysDebug("type_info::operator=, was %s now %s", __type_name, rhs.__type_name);
__type_name = rhs.__type_name;
return *this;
}
__type_name = rhs.__type_name;
return *this;
}
@@
-72,13
+73,13
@@
bool type_info::is_subclass() const
// Acess-defined
bool type_info::__is_child(const type_info &poss_child, unsigned long &offset) const
{
// Acess-defined
bool type_info::__is_child(const type_info &poss_child, unsigned long &offset) const
{
+ _SysDebug("typeids = this:%s , poss_child:%s", typeid(*this).name(), typeid(poss_child).name());
+
// Check #1: Child is same type
if( poss_child == *this ) {
offset = 0;
return true;
}
// Check #1: Child is same type
if( poss_child == *this ) {
offset = 0;
return true;
}
-
- _SysDebug("typeids = this:%s , poss_child:%s", typeid(*this).name(), typeid(poss_child).name());
// Check #2: This type must be a class
if( !this->is_class() ) {
// Check #2: This type must be a class
if( !this->is_class() ) {
@@
-99,6
+100,7
@@
bool type_info::__is_child(const type_info &poss_child, unsigned long &offset) c
// Multiple inheritance
_SysDebug("TODO: type_info::__is_child - Multiple inheritance");
abort();
// Multiple inheritance
_SysDebug("TODO: type_info::__is_child - Multiple inheritance");
abort();
+ for(;;);
}
else {
// Oops!
}
else {
// Oops!
@@
-106,6
+108,7
@@
bool type_info::__is_child(const type_info &poss_child, unsigned long &offset) c
typeid(poss_child).name()
);
abort();
typeid(poss_child).name()
);
abort();
+ for(;;);
}
}
}
}
UCC
git Repository :: git.ucc.asn.au