Skip to content

COMP: Remove vcl_complex.h from Python builds #94

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

Merged
thewtex merged 2 commits into from
Nov 6, 2018
Merged

COMP: Remove vcl_complex.h from Python builds #94

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
ad077cc
COMP: Remove vcl_complex.h from Python builds
thewtex Nov 5, 2018
803fc9b
BUG: Remove vcl_complex support from itkTemplate.py
thewtex Nov 5, 2018
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 Modules/Core/Common/wrapping/vnl_c_vector.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# auto include feature must be disable because the class is not in the file
# with the same name
set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
itk_wrap_include("vcl_complex.h")
itk_wrap_include("complex")
itk_wrap_include("vnl/vnl_c_vector.h")

itk_wrap_class("vnl_c_vector" EXPLICIT_SPECIALIZATION)
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/wrapping/vnl_diag_matrix.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# auto include feature must be disable because the class is not in the file
# with the same name
set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
itk_wrap_include("vcl_complex.h")
itk_wrap_include("complex")
itk_wrap_include("vnl/vnl_diag_matrix.h")

itk_wrap_class("vnl_diag_matrix" EXPLICIT_SPECIALIZATION)
Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/wrapping/vnl_matrix.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# auto include feature must be disable because the class is not in the file
# with the same name
set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
itk_wrap_include("vcl_complex.h")
itk_wrap_include("complex")
itk_wrap_include("vnl/vnl_vector.h")
itk_wrap_include("vnl/vnl_matrix.h")

Expand Down
2 changes: 1 addition & 1 deletion Modules/Core/Common/wrapping/vnl_vector.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# auto include feature must be disable because the class is not in the file
# with the same name
set(WRAPPER_AUTO_INCLUDE_HEADERS OFF)
itk_wrap_include("vcl_complex.h")
itk_wrap_include("complex")
itk_wrap_include("vnl/vnl_matrix.h")
itk_wrap_include("vnl/vnl_vector.h")

Expand Down
5 changes: 0 additions & 5 deletions Wrapping/Generators/Python/itkTemplate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,6 @@ def __add__(self, paramSetString, cl):
# itk::Numerics::Sample -> itkSample
shortNameSize = len(re.sub(r':.*:', '', self.__name__))
attributeName = cl.__name__[shortNameSize:]
elif cl.__name__.startswith("vcl_complex"):
raise AttributeError('former vcl_complex, handling ' + str(cl.__name__))
# C++ name is likely to be std::complex here, instead of the
# expected vcl_complex
attributeName = cl.__name__[len("vcl_complex"):]
else:
shortName = re.sub(r':.*:', '', self.__name__)

Expand Down