diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:15:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:15:30 +0000 |
| commit | 29006cd8763f900311d43a1b949484cef1768c5a (patch) | |
| tree | 656123b12f43ff6554970fac78d1179476e53765 /bridges | |
| parent | 2d56b65ed34f4f95d98c1fe062e17b9fdef944a7 (diff) | |
INTEGRATION: CWS sb29 (1.2.68); FILE MERGED
2005/01/31 13:32:04 sb 1.2.68.1: #i41344# Adapted Solaris Intel cpp_uno bridge to multiple-inheritance UNO interface types.
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/shared/types.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/bridges/source/cpp_uno/shared/types.cxx b/bridges/source/cpp_uno/shared/types.cxx index 9452d3d5df03..f6306608689c 100644 --- a/bridges/source/cpp_uno/shared/types.cxx +++ b/bridges/source/cpp_uno/shared/types.cxx @@ -2,9 +2,9 @@ * * $RCSfile: types.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-02-03 12:52:17 $ + * last change: $Author: vg $ $Date: 2005-02-21 12:15:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,23 +65,19 @@ #include "typelib/typeclass.h" #include "typelib/typedescription.h" -namespace { +namespace bridges { namespace cpp_uno { namespace shared { -bool isSimpleTypeClass(typelib_TypeClass typeClass) { +bool isSimpleType(typelib_TypeClass typeClass) { return typeClass <= typelib_TypeClass_DOUBLE || typeClass == typelib_TypeClass_ENUM; } -} - -namespace bridges { namespace cpp_uno { namespace shared { - bool isSimpleType(typelib_TypeDescriptionReference const * type) { - return isSimpleTypeClass(type->eTypeClass); + return isSimpleType(type->eTypeClass); } bool isSimpleType(typelib_TypeDescription const * type) { - return isSimpleTypeClass(type->eTypeClass); + return isSimpleType(type->eTypeClass); } bool relatesToInterfaceType(typelib_TypeDescription const * type) { |