Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SofaPython] Fix duplicate symbol #1036

Merged
merged 2 commits into from
May 13, 2019
Merged

[SofaPython] Fix duplicate symbol #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64b8eb9
Fix rare problem with duplicate symbols
fredroy May 11, 2019
d46cbb4
Add macro for windows
fredroy May 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions applications/plugins/SofaPython/PythonScriptControllerHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ namespace helper {

namespace internal {


void PythonScriptController_parametersToVector(std::vector<PyObject*> & /*vecParam*/) {return;}

PyObject* PythonScriptController_valueToPyObject(bool param)
{
PyObject* value = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion applications/plugins/SofaPython/PythonScriptControllerHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ SOFA_SOFAPYTHON_API void PythonScriptController_pyObjectToValue(PyObject* pyObje
SOFA_SOFAPYTHON_API void PythonScriptController_pyObjectToValue(PyObject* pyObject, std::string & val);


void PythonScriptController_parametersToVector(std::vector<PyObject*> & /*vecParam*/) {return;}
SOFA_SOFAPYTHON_API void PythonScriptController_parametersToVector(std::vector<PyObject*> & /*vecParam*/);

template<typename T, typename... ParametersType>
void PythonScriptController_parametersToVector(std::vector<PyObject*> & vecParam, T param, ParametersType... otherParameters)
Expand Down