bridges/source/cpp_uno/shared/vtablefactory.cxx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 942b1f3fb9aab29ab0c5621234b2d058ddc37c29
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Wed Apr 5 09:10:09 2017 +0200
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 <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
