[Libreoffice-commits] .: l10ntools/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 20 13:03:58 PST 2012


 l10ntools/source/po.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ad55015326edc0c9d21c446cdb9cff9ea12cc4c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Tue Nov 20 22:01:05 2012 +0100

    work around ambiguity with msvc and old gcc
    
    C:/cygwin/home/tinderbox/master-build/l10ntools/source/po.cxx(188) : error C2666: 'std::fpos<_Statetype>::operator !=' : 2 overloads have similar conversions
            with
            [
                _Statetype=_Mbstatet
            ]
            C:/PROGRA~2/MICROS~1.0/VC/include\iosfwd(116): could be 'bool std::fpos<_Statetype>::operator !=(const std::fpos<_Statetype> &) const'
            with
            [
                _Statetype=_Mbstatet
            ]
            or       'built-in C++ operator!=(std::streamoff, long)'
            while trying to match the argument list '(std::fpos<_Statetype>, long)'
            with
            [
                _Statetype=_Mbstatet
            ]
    
    Change-Id: Id1375d68996414c5ccf75d5d3ebc0afad061e3d2

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 6ce5018..8ee7dc9 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -185,7 +185,7 @@ void GenPoEntry::setFuzzy(const bool bFuzzy)
 //Write to file
 void GenPoEntry::writeToFile(std::ofstream& rOFStream) const
 {
-    if ( rOFStream.tellp() != 0 )
+    if ( rOFStream.tellp() != std::ofstream::pos_type( 0 ))
         rOFStream << std::endl;
     if ( !m_sExtractCom.isEmpty() )
         rOFStream


More information about the Libreoffice-commits mailing list