diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-02-14 21:26:13 -0800 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-02-14 21:26:13 -0800 |
| commit | 096b74e272377104493fcf81dd88743783e6e9f1 (patch) | |
| tree | 3db81abddd733624eb4dfe00f42d01322216c20f /tools | |
| parent | 690706549ac70b03236a3c3ddf90780e05b7effb (diff) | |
Merge PRV_SV_DECL_REF_LOCK into SV_DECL_LOCK
Also delete some commented out code.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/pstm.hxx | 11 | ||||
| -rw-r--r-- | tools/inc/tools/ref.hxx | 6 |
2 files changed, 3 insertions, 14 deletions
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx index d1f473141cf0..a435fc586539 100644 --- a/tools/inc/tools/pstm.hxx +++ b/tools/inc/tools/pstm.hxx @@ -57,16 +57,7 @@ public: }; /************************** S v R t t i B a s e **************************/ -/* -#if defined (DOS) && defined (STC) -#ifdef WIN -#error Fuer Win muss der Kram virtual sein (MM/MH) -#endif -class SvRttiBase : public SvRefBase -#else -class SvRttiBase : virtual public SvRefBase -#endif -*/ + class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase { public: diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx index 86c604682b21..fb779d053b64 100644 --- a/tools/inc/tools/ref.hxx +++ b/tools/inc/tools/ref.hxx @@ -82,9 +82,6 @@ public: \ #define PRV_SV_DECL_REF( ClassName ) \ PRV_SV_DECL_REF_LOCK( ClassName, Ref ) -#define PRV_SV_DECL_LOCK( ClassName ) \ -PRV_SV_DECL_REF_LOCK( ClassName, Lock ) - #define SV_DECL_REF( ClassName ) \ class ClassName; \ class ClassName##Ref \ @@ -96,7 +93,7 @@ class ClassName##Ref \ class ClassName; \ class ClassName##Lock \ { \ - PRV_SV_DECL_LOCK( ClassName ) \ + PRV_SV_DECL_REF_LOCK( ClassName, Lock ) \ }; #define SV_IMPL_REF( ClassName ) \ @@ -145,6 +142,7 @@ inline void Append( const CN##MemberList & );\ #define SV_DECL_REF_LIST(CN,EN) \ PRV_SV_DECL_REF_LIST(CN,EN,/* empty */) + #define SV_DECL_REF_LIST_VISIBILITY(CN,EN,vis) \ PRV_SV_DECL_REF_LIST(CN,EN,vis) |