diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 12:32:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 22:48:12 +0100 |
| commit | 6896184167ad084fad298ababff7e6d026d0b929 (patch) | |
| tree | 2bfbb7ca0754e90712725a4d9b6906abe62c9cc3 /starmath | |
| parent | 66ef8ca217680095d8aaae025d82c2cbcd8ec1d2 (diff) | |
HAVE_CXX_CWG1579_FIX is always true now
...(according to
<http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1579> it is fixed
in C++14), but for safety, leave the configure.ac check in for some longer.
Change-Id: Ibd2f0cac228117e35ac299e2fe74207394c900cd
Reviewed-on: https://gerrit.libreoffice.org/64773
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/parse.cxx | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 937ef8d5b9cf..3c1fc94f7a8f 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/i18n/UnicodeType.hpp> #include <com/sun/star/i18n/KParseTokens.hpp> #include <com/sun/star/i18n/KParseType.hpp> -#include <config_global.h> #include <i18nlangtag/lang.h> #include <tools/lineend.hxx> #include <unotools/configmgr.hxx> @@ -1016,11 +1015,7 @@ std::unique_ptr<SmNode> SmParser::DoAlign(bool bUseExtraSpaces) if (xSNode) { xSNode->SetSubNode(0, pNode.release()); -#if HAVE_CXX_CWG1579_FIX return xSNode; -#else - return std::move(xSNode); -#endif } return pNode; } @@ -1055,11 +1050,7 @@ std::unique_ptr<SmNode> SmParser::DoLine() auto xSNode = o3tl::make_unique<SmLineNode>(m_aCurToken); xSNode->SetSubNodes(buildNodeArray(ExpressionArray)); -#if HAVE_CXX_CWG1579_FIX return xSNode; -#else - return std::move(xSNode); -#endif } std::unique_ptr<SmNode> SmParser::DoExpression(bool bUseExtraSpaces) @@ -1078,11 +1069,7 @@ std::unique_ptr<SmNode> SmParser::DoExpression(bool bUseExtraSpaces) std::unique_ptr<SmExpressionNode> xSNode(new SmExpressionNode(m_aCurToken)); xSNode->SetSubNodes(buildNodeArray(RelationArray)); xSNode->SetUseExtraSpaces(bUseExtraSpaces); -#if HAVE_CXX_CWG1579_FIX return xSNode; -#else - return std::move(xSNode); -#endif } else { @@ -1287,11 +1274,7 @@ std::unique_ptr<SmNode> SmParser::DoSubSup(TG nActiveGroup, SmNode *pGivenNode) } pNode->SetSubNodes(buildNodeArray(aSubNodes)); -#if HAVE_CXX_CWG1579_FIX return pNode; -#else - return std::move(pNode); -#endif } std::unique_ptr<SmNode> SmParser::DoOpSubSup() @@ -1307,11 +1290,7 @@ std::unique_ptr<SmNode> SmParser::DoOpSubSup() // get sub- supscripts if any if (m_aCurToken.nGroup == TG::Power) return DoSubSup(TG::Power, pNode.release()); -#if HAVE_CXX_CWG1579_FIX return pNode; -#else - return std::move(pNode); -#endif } std::unique_ptr<SmNode> SmParser::DoPower() @@ -1813,11 +1792,7 @@ std::unique_ptr<SmStructureNode> SmParser::DoAttribut() xSNode->SetSubNodes(xAttr.release(), nullptr); // the body will be filled later xSNode->SetScaleMode(eScaleMode); -#if HAVE_CXX_CWG1579_FIX return xSNode; -#else - return std::move(xSNode); -#endif } std::unique_ptr<SmStructureNode> SmParser::DoFontAttribut() @@ -1838,11 +1813,7 @@ std::unique_ptr<SmStructureNode> SmParser::DoFontAttribut() { auto pNode = o3tl::make_unique<SmFontNode>(m_aCurToken); NextToken(); -#if HAVE_CXX_CWG1579_FIX return pNode; -#else - return std::move(pNode); -#endif } case TSIZE : @@ -2002,11 +1973,7 @@ std::unique_ptr<SmStructureNode> SmParser::DoFontSize() NextToken(); pFontNode->SetSizeParameter(aValue, Type); -#if HAVE_CXX_CWG1579_FIX return pFontNode; -#else - return std::move(pFontNode); -#endif } std::unique_ptr<SmStructureNode> SmParser::DoBrace() |