boost/boost.6397.warnings.patch | 19 ++++++++++++++++--- l10ntools/source/cfglex.l | 3 ++- l10ntools/source/srclex.l | 3 ++- l10ntools/source/xrmlex.l | 3 ++- 4 files changed, 22 insertions(+), 6 deletions(-)
New commits: commit 0789a8ef9176b1f84b61d9d7bd9556395a21b8c8 Author: Caolán McNamara <caol...@redhat.com> Date: Fri Nov 23 18:41:03 2012 +0000 WaE: some additional warnings Change-Id: I6a86661dfceb4ecaeadb4fb045e924f2b65e1ad2 diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch index e2e52ff..d41df08 100644 --- a/boost/boost.6397.warnings.patch +++ b/boost/boost.6397.warnings.patch @@ -169,15 +169,28 @@ } else { std::fill_n(index_base_list_.begin(),NumDims,0); } +@@ -597,9 +597,9 @@ + #endif // BOOST_MSVC + typename const_array_view<NDims>::type + operator[](const detail::multi_array:: +- index_gen<NumDims,NDims>& indices) ++ index_gen<NumDims,NDims>& indices_) + const { +- return super_type::operator[](indices); ++ return super_type::operator[](indices_); + } + + const_iterator begin() const { @@ -622,9 +622,9 @@ // This is only supplied to support multi_array's default constructor explicit multi_array_ref(T* base, const storage_order_type& so, - const index* index_bases, -+ const index* index_bases_, - const size_type* extents) : +- const size_type* extents) : - super_type(base,so,index_bases,extents) { } -+ super_type(base,so,index_bases_,extents) { } ++ const index* index_bases_, ++ const size_type* extents_) : ++ super_type(base,so,index_bases_,extents_) { } }; commit e54dc7b8a4823db1050a11ec72f814bbecd3ba4a Author: Caolán McNamara <caol...@redhat.com> Date: Fri Nov 23 14:26:29 2012 +0000 WaE: comparison of char to EOF always false on ppc Change-Id: I77b27ea765230d13b9b81faf5b5cf5acc4897616 diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l index 3ace0a7..e8e6b1a 100644 --- a/l10ntools/source/cfglex.l +++ b/l10ntools/source/cfglex.l @@ -101,7 +101,8 @@ int bText=0; \<\!\-\- { - char c1 = 0, c2 = 0, c3 = yyinput(); + char c1 = 0, c2 = 0; + int c3 = yyinput(); char pChar[2]; pChar[1] = 0x00; pChar[0] = c3; diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l index 9215702..755b0b3 100644 --- a/l10ntools/source/srclex.l +++ b/l10ntools/source/srclex.l @@ -94,7 +94,8 @@ void YYWarning(); WorkOnTokenSet( IGNOREDTOKENS, yytext ); } "/*" { - char c1 = 0,c2 = yyinput(); + char c1 = 0; + int c2 = yyinput(); char pChar[2]; pChar[1] = 0x00; pChar[0] = c2; diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l index 8d6094c..ad5b949 100644 --- a/l10ntools/source/xrmlex.l +++ b/l10ntools/source/xrmlex.l @@ -156,7 +156,8 @@ int bText=0; "<!--" { - char c1 = 0, c2 = 0, c3 = yyinput(); + char c1 = 0, c2 = 0; + int c3 = yyinput(); char pChar[2]; pChar[1] = 0x00; pChar[0] = c3;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits