[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sw/inc sw/source

[Noel Grandin]

 compilerplugins/clang/stringconstant.cxx |    2 +-
 sw/inc/index.hxx                         |    4 ----
 sw/source/core/bastyp/index.cxx          |    2 --
 sw/source/core/docnode/node.cxx          |    2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 38ea4f018e795aa2b191509d2c1f56b76191f079
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Jun 25 13:48:11 2015 +0200

    error: invalid operands to binary expression ('llvm::APSInt' and 'int')
    
    Change-Id: I1a509ce133954a31a504dcc178687427f85f4c1c

diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx
index 9c86921..5ffec1b 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -1191,7 +1191,7 @@ void StringConstant::handleOUStringCtor(
         && e3->getArg(0)->IgnoreParenImpCasts()->isIntegerConstantExpr(
             res, compiler.getASTContext()))
     {
-        if (res > 0 && res <= 127) {
+        if (res > static_cast<APSInt>(0) && res <= static_cast<APSInt>(127)) {
             report(
                 DiagnosticsEngine::Warning,
                 ("in call of %0, replace OUString constructed from a (non-NUL)"
commit 25603e07974d85a7c6b3cebe288068955a0030a1
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Jun 25 13:25:39 2015 +0200

    remove custom RTTI from SwIndex
    
    not being used
    
    Change-Id: I615558e3c0abe7284b9abb535ee8f15c844c846e

diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index e430fa8..a1d5da7 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -131,10 +131,6 @@ public:
     SwIndexReg();
     virtual ~SwIndexReg();
 
-    /// rtti, derived classes might do the same. If so, one can cast typesavely
-    /// via SwIndexReg.
-    TYPEINFO();
-
     void MoveTo( SwIndexReg& rArr );
     const SwIndex* GetFirstIndex() const { return m_pFirst; }
 };
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index edc2218..c79005b 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -24,8 +24,6 @@
 
 #include <crossrefbookmark.hxx>
 
-TYPEINIT0(SwIndexReg);
-
 SwIndex::SwIndex(SwIndexReg *const pReg, sal_Int32 const nIdx)
     : m_nIndex( nIdx )
     , m_pIndexReg( pReg )
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index a7c2055..c776512 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -69,7 +69,7 @@
 
 using namespace ::com::sun::star::i18n;
 
-TYPEINIT2( SwContentNode, SwModify, SwIndexReg )
+TYPEINIT1( SwContentNode, SwModify )
 
 /*
  * Some local helper functions for the attribute set handle of a content node.