summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-05 09:10:09 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-05 09:47:35 +0000
commit942b1f3fb9aab29ab0c5621234b2d058ddc37c29 (patch)
tree03d1b6ed7f2017bd13ffbfbba0fd0d3fb69d74ad /bridges
parent97f048e633f07655eda000ae4f4da818c935091e (diff)
fix shadow warning with latest clang
Change-Id: I0640d4e816ba73f900ad21d7603743e0e9695a70 error: declaration shadows a typedef in 'bridges::cpp_uno::shared::VtableFactory' [-Werror,-Wshadow] Reviewed-on: https://gerrit.libreoffice.org/36127 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/shared/vtablefactory.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 7f524df6d1d5..65dbb03c1cd1 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -155,9 +155,7 @@ private:
sal_Int32 calculate(
typelib_InterfaceTypeDescription * type, sal_Int32 offset);
- typedef std::unordered_map< OUString, sal_Int32, OUStringHash > Map;
-
- Map m_map;
+ std::unordered_map< OUString, sal_Int32, OUStringHash > m_map;
};
sal_Int32 VtableFactory::BaseOffset::calculate(
@@ -168,7 +166,7 @@ sal_Int32 VtableFactory::BaseOffset::calculate(
for (sal_Int32 i = 0; i < type->nBaseTypes; ++i) {
offset = calculate(type->ppBaseTypes[i], offset);
}
- m_map.insert(Map::value_type(name, offset));
+ m_map.insert({name, offset});
typelib_typedescription_complete(
reinterpret_cast< typelib_TypeDescription ** >(&type));
offset += bridges::cpp_uno::shared::getLocalFunctions(type);