diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 06:58:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 06:58:50 +0000 |
| commit | 98224ed7a55bdf94b0f3636f102e0edd8a9f21dc (patch) | |
| tree | c46c78fd0a37ad16d936147a3bb7309d626ef727 | |
| parent | 989fc1fe74db1629ece84e49a89e645df02fea27 (diff) | |
INTEGRATION: CWS gccfour (1.7.56); FILE MERGED
2005/03/14 11:29:47 cmc 1.7.56.1: #i44718# name anonymous enums that are compared against ints
| -rw-r--r-- | desktop/source/deployment/registry/component/dp_component.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/inc/dp_backend.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index f96598cfe619..f99e0f33462b 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dp_component.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2005-01-21 17:13:33 $ + * last change: $Author: rt $ $Date: 2005-04-04 07:58:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,7 +114,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend const OUString m_loader; Reference<XComponentContext> m_xRemoteContext; - enum { + enum reg { REG_UNINIT, REG_VOID, REG_REGISTERED, REG_NOT_REGISTERED } m_registered; diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index a6864332f433..58f9c7f06fc5 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -2,9 +2,9 @@ * * $RCSfile: dp_backend.h,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2005-01-21 17:14:01 $ + * last change: $Author: rt $ $Date: 2005-04-04 07:58:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -262,7 +262,7 @@ class PackageRegistryBackend protected: ::rtl::OUString m_context; // currently only for library containers: - enum { + enum context { CONTEXT_UNKNOWN, CONTEXT_USER, CONTEXT_SHARED, CONTEXT_DOCUMENT |