summaryrefslogtreecommitdiff
path: root/ucb/source/inc
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-06-05 16:53:18 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-06-05 16:53:18 +0000
commit5b0f5880500efa3eee8c64dc45022eba63804b56 (patch)
tree00b1c559d878afc0993d9dca385b96ea6adfeca1 /ucb/source/inc
parent7f8a992cd995b311d06cbd5798c4557c6b4308cd (diff)
INTEGRATION: CWS bgdlremove (1.5.108); FILE MERGED
2007/05/18 14:06:49 kso 1.5.108.1: #i77419# - cleanup of ucbhelper namespaces.
Diffstat (limited to 'ucb/source/inc')
-rw-r--r--ucb/source/inc/regexpmap.tpt15
1 files changed, 6 insertions, 9 deletions
diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 1b864872a27b..05e73cac1c10 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -4,9 +4,9 @@
*
* $RCSfile: regexpmap.tpt,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 15:18:45 $
+ * last change: $Author: ihi $ $Date: 2007-06-05 17:53:18 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -50,13 +50,10 @@
#include "regexp.hxx"
#endif
-namespace unnamed_ucb_regexpmap {} using namespace unnamed_ucb_regexpmap;
- // unnamed namespaces don't work well yet...
-
-using namespace ucb;
+using namespace ucb_impl;
//============================================================================
-namespace unnamed_ucb_regexpmap {
+namespace {
template< typename Val >
struct Entry
@@ -79,7 +76,7 @@ template< typename Val > class List: public std::list< Entry< Val > > {};
//
//============================================================================
-namespace ucb {
+namespace ucb_impl {
template< typename Val >
class RegexpMapIterImpl
@@ -364,7 +361,7 @@ RegexpMapEntry< Val > const * RegexpMapIter< Val >::operator ->() const
//
//============================================================================
-namespace ucb {
+namespace ucb_impl {
template< typename Val >
struct RegexpMapImpl