diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
| commit | fd0649408ac52ec0c6a443c5716d50c9243bca7e (patch) | |
| tree | 5c5472ebd37157ec38bef497ddad7c8fa4acfbba /sal/osl/all/debugbase.cxx | |
| parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
| parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'sal/osl/all/debugbase.cxx')
| -rw-r--r-- | sal/osl/all/debugbase.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx index ca65d9236..15d6a60a5 100644 --- a/sal/osl/all/debugbase.cxx +++ b/sal/osl/all/debugbase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,8 +51,8 @@ namespace { typedef std::vector<rtl::OString, rtl::Allocator<rtl::OString> > OStringVec; struct StaticDebugBaseAddressFilter - : rtl::StaticWithInit<OStringVec const, StaticDebugBaseAddressFilter> { - OStringVec const operator()() const { + : rtl::StaticWithInit<OStringVec, StaticDebugBaseAddressFilter> { + OStringVec operator()() const { OStringVec vec; rtl_uString * pStr = 0; rtl::OUString const name( @@ -159,3 +160,4 @@ void SAL_CALL osl_detail_ObjectRegistry_revokeObject( } // extern "C" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |