Skip to content

[Type] Standardize extern template instantiations for vector #6105

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

Open
alxbilger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Type] Standardize extern template instantiations for vector #6105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sofa/framework/Type/src/sofa/type/vector_Integral.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* *
* Contact information: contact@sofa-framework.org *
******************************************************************************/
#define SOFA_HELPER_VECTOR_INTEGRAL_DEFINITION
#define SOFA_TYPE_VECTOR_INTEGRAL_CPP

#include <sofa/type/vector_Integral.h>
#include <sofa/type/vector_T.inl>
Expand Down
11 changes: 11 additions & 0 deletions Sofa/framework/Type/src/sofa/type/vector_Integral.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,14 @@ template<> SOFA_TYPE_API std::istream& sofa::type::vector<unsigned int>::read( s
template<> SOFA_TYPE_API std::ostream& sofa::type::vector<unsigned char>::write(std::ostream& os) const;
template<> SOFA_TYPE_API std::istream& sofa::type::vector<unsigned char>::read(std::istream& in);

#if !defined(SOFA_TYPE_VECTOR_INTEGRAL_CPP)
extern template class SOFA_TYPE_API sofa::type::vector<bool>;
extern template class SOFA_TYPE_API sofa::type::vector<char>;
extern template class SOFA_TYPE_API sofa::type::vector<unsigned char>;
extern template class SOFA_TYPE_API sofa::type::vector<int>;
extern template class SOFA_TYPE_API sofa::type::vector<unsigned int>;
extern template class SOFA_TYPE_API sofa::type::vector<long>;
extern template class SOFA_TYPE_API sofa::type::vector<unsigned long>;
extern template class SOFA_TYPE_API sofa::type::vector<long long>;
extern template class SOFA_TYPE_API sofa::type::vector<unsigned long long>;
#endif
1 change: 1 addition & 0 deletions Sofa/framework/Type/src/sofa/type/vector_Real.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* *
* Contact information: contact@sofa-framework.org *
******************************************************************************/
#define SOFA_TYPE_VECTOR_REAL_CPP
#include <sofa/type/vector_Real.h>
#include <sofa/type/vector_T.inl>

Expand Down
4 changes: 4 additions & 0 deletions Sofa/framework/Type/src/sofa/type/vector_Real.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@
#pragma once
#include <sofa/type/vector_T.h>

#if !defined(SOFA_TYPE_VECTOR_REAL_CPP)
extern template class SOFA_TYPE_API sofa::type::vector<float>;
extern template class SOFA_TYPE_API sofa::type::vector<double>;
#endif
2 changes: 1 addition & 1 deletion Sofa/framework/Type/src/sofa/type/vector_String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* *
* Contact information: contact@sofa-framework.org *
******************************************************************************/
#define SOFA_HELPER_VECTOR_STRING_DEFINITION
#define SOFA_TYPE_VECTOR_STRING_CPP
#include <sofa/type/vector_String.h>
#include <sofa/type/vector_T.inl>

Expand Down
3 changes: 3 additions & 0 deletions Sofa/framework/Type/src/sofa/type/vector_String.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@

template<> SOFA_TYPE_API std::ostream& sofa::type::vector<std::string>::write(std::ostream& os) const;

#if !defined(SOFA_TYPE_VECTOR_STRING_CPP)
extern template class SOFA_TYPE_API sofa::type::vector<std::string>;
#endif
Loading