summaryrefslogtreecommitdiff
path: root/bridges/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-04-15 05:41:26 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-04-15 05:41:26 +0200
commit06f53420f640d1c22b66aa842321a0cf1bc59a05 (patch)
treeab060eb531e2d809bc04ec1b95200773dfb92a52 /bridges/source
parent1264480bc32e8dbadd654a0a014e8045c57d1ae4 (diff)
fdo#60724 convertable -> convertible
Change-Id: I6a742f41305c2b4bd9a60aa3a574f6c02fec4752
Diffstat (limited to 'bridges/source')
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index fa3f3ae8824b..325d70e31849 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -178,7 +178,7 @@ void
constructcatchobject(
cxxregistration * cxxreg,
const ehandler * const catchblock,
- catchabletype * const convertable,
+ catchabletype * const convertible,
const dispatcher_context* const dispatch
)
const
@@ -196,18 +196,18 @@ void
: reinterpret_cast<eobject**>(catchblock->eobject_bpoffset + cxxreg->fp.FramePointers);
if(catchblock->isreference){
// just ref/pointer
- *objplace = adjust_pointer(get_object(), convertable);
- }else if(convertable->memmoveable){
+ *objplace = adjust_pointer(get_object(), convertible);
+ }else if(convertible->memmoveable){
// POD
- std::memcpy(objplace, get_object(), convertable->object_size);
- if(convertable->object_size == sizeof(void*) && *objplace)
- *objplace = adjust_pointer((void*)*objplace, convertable);
+ std::memcpy(objplace, get_object(), convertible->object_size);
+ if(convertible->object_size == sizeof(void*) && *objplace)
+ *objplace = adjust_pointer((void*)*objplace, convertible);
}else{
// if copy ctor exists, call it; binary copy otherwise
- if(convertable->copyctor){
- cinfo = convertable->hasvirtbase ? civirtual : cicomplex;
+ if(convertible->copyctor){
+ cinfo = convertible->hasvirtbase ? civirtual : cicomplex;
}else{
- std::memcpy(objplace, (const void*)adjust_pointer(get_object(), convertable), convertable->object_size);
+ std::memcpy(objplace, (const void*)adjust_pointer(get_object(), convertible), convertible->object_size);
}
}
}
@@ -216,8 +216,8 @@ void
eobject* objthis = catchblock->ishz
? reinterpret_cast<eobject*>(cxxreg)
: reinterpret_cast<eobject*>(catchblock->eobject_bpoffset + cxxreg->fp.FramePointers);
- void* copyctor = thrown_va(convertable->copyctor);
- eobject* copyarg = adjust_pointer(get_object(), convertable);
+ void* copyctor = thrown_va(convertible->copyctor);
+ eobject* copyarg = adjust_pointer(get_object(), convertible);
if(cinfo == cicomplex)
(eobject::ctor_ptr (copyctor))(objthis, copyarg);
else