diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:37 +0100 |
| commit | d61d47ad021711718d9bb41a6b548210781e8b26 (patch) | |
| tree | 9f9cc3e9edf059c4059d280917002f8909903b40 /sccomp/source | |
| parent | 2e3539813f612921611bc49a2334457270addb04 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I0fc3144d5791e66d873c36f9a9adf1f3ca152d52
Diffstat (limited to 'sccomp/source')
| -rw-r--r-- | sccomp/source/solver/CoinMPSolver.cxx | 8 | ||||
| -rw-r--r-- | sccomp/source/solver/LpsolveSolver.cxx | 2 | ||||
| -rw-r--r-- | sccomp/source/solver/SolverComponent.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx index 41c71bc4a0c1..0fad6ca63ceb 100644 --- a/sccomp/source/solver/CoinMPSolver.cxx +++ b/sccomp/source/solver/CoinMPSolver.cxx @@ -243,7 +243,7 @@ void SAL_CALL CoinMPSolver::solve() throw(uno::RuntimeException, std::exception) } pMatrixBegin[nVariables] = nMatrixPos; delete[] pCompMatrix; - pCompMatrix = NULL; + pCompMatrix = nullptr; // apply settings to all variables @@ -291,9 +291,9 @@ void SAL_CALL CoinMPSolver::solve() throw(uno::RuntimeException, std::exception) HPROB hProb = CoinCreateProblem(""); int nResult = CoinLoadProblem( hProb, nVariables, nRows, nMatrixPos, 0, nObjectSense, nObjectConst, pObjectCoeffs, - pLowerBounds, pUpperBounds, pRowType, pRHS, NULL, + pLowerBounds, pUpperBounds, pRowType, pRHS, nullptr, pMatrixBegin, pMatrixCount, pMatrixIndex, pMatrix, - NULL, NULL, NULL ); + nullptr, nullptr, nullptr ); if (nResult == SOLV_CALL_SUCCESS) { nResult = CoinLoadInteger( hProb, pColType ); @@ -340,7 +340,7 @@ void SAL_CALL CoinMPSolver::solve() throw(uno::RuntimeException, std::exception) // get solution maSolution.realloc( nVariables ); - CoinGetSolutionValues( hProb, maSolution.getArray(), NULL, NULL, NULL ); + CoinGetSolutionValues( hProb, maSolution.getArray(), nullptr, nullptr, nullptr ); mfResultValue = CoinGetObjectValue( hProb ); } else diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx index 5323be22b8cd..1652cb11c9ec 100644 --- a/sccomp/source/solver/LpsolveSolver.cxx +++ b/sccomp/source/solver/LpsolveSolver.cxx @@ -312,7 +312,7 @@ void SAL_CALL LpsolveSolver::solve() throw(uno::RuntimeException, std::exception maSolution.realloc( nVariables ); - REAL* pResultVar = NULL; + REAL* pResultVar = nullptr; get_ptr_variables( lp, &pResultVar ); for (nVar=0; nVar<nVariables; nVar++) maSolution[nVar] = pResultVar[nVar]; diff --git a/sccomp/source/solver/SolverComponent.cxx b/sccomp/source/solver/SolverComponent.cxx index 910fbf93c770..b7df95b6ec19 100644 --- a/sccomp/source/solver/SolverComponent.cxx +++ b/sccomp/source/solver/SolverComponent.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star; // Resources from tools are used for translated strings -ResMgr* SolverComponent::pSolverResMgr = NULL; +ResMgr* SolverComponent::pSolverResMgr = nullptr; OUString SolverComponent::GetResourceString( sal_uInt32 nId ) { |