Skip to content

Commit 6d404cd

Browse files
authored
[Plugin] Use non-deprecated header/class (#219)
Some deprecated testing headers are used, so this PR change those to the normal ones. (those headers will be disabled in a PR in SOFA, before v21.12 release)
1 parent fc9d160 commit 6d404cd

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Plugin/src/SofaPython3/PythonTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ using namespace pybind11::literals; // to bring in the `_a` literal
2525
#include <pybind11/embed.h>
2626
namespace py = pybind11;
2727

28-
#include <sofa/helper/testing/BaseTest.h>
28+
#include <sofa/testing/BaseTest.h>
2929
#include <sofa/helper/logging/Messaging.h>
3030
#include <sofa/helper/system/FileSystem.h>
3131

Plugin/src/SofaPython3/PythonTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222

2323
#include <string>
2424
#include <SofaPython3/config.h>
25-
#include <sofa/helper/testing/BaseTest.h>
25+
#include <sofa/testing/BaseTest.h>
2626

2727
#include <filesystem>
2828
using std::filesystem::path;
2929

3030
namespace sofapython3
3131
{
3232

33-
using sofa::helper::testing::BaseTest;
33+
using sofa::testing::BaseTest;
3434

3535
/// a Python_test is defined by a python filepath and optional arguments
3636
struct SOFAPYTHON3_API PythonTestData

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_ForceField.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ namespace sofapython3
133133
void ForceField_Trampoline<TDOFType>::addKToMatrix(const MechanicalParams* mparams, const MultiMatrixAccessor* dfId)
134134
{
135135
MultiMatrixAccessor::MatrixRef mref = dfId->getMatrix(this->mstate);
136-
sofa::defaulttype::BaseMatrix* mat = mref.matrix;
136+
sofa::linearalgebra::BaseMatrix* mat = mref.matrix;
137137

138138
size_t offset = mref.offset;
139139
// nNodes is the number of nodes (positions) of the object whose K matrix we're computing

0 commit comments

Comments
 (0)