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

Better C++ support (#254) #255

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

Better C++ support (#254) #255

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
14 changes: 10 additions & 4 deletions api/fftw3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,22 @@
#include <stdio.h>

#ifdef __cplusplus
# if __cplusplus >= 201103L && defined(FFTW_cpp_complex)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add these to cmake (and autotools)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You wouldn't need them for compiling FFTW itself…

Copy link

@LecrisUT LecrisUT Jan 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, good point. But still they need to be included in cmake export and pkg-config. Or at least documented somewhere

Edit: This could look like:

target_compile_definitions(${fttw_libs} $<$<AND:INSTALL_INTERFACE,CMAKE_CXX_COMPILER>:FFTW_cpp_complex>)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They wouldn't be in pkg-config etcetera because you would need to enable this API in manually user code — it can't be turned on automatically, since that would break backwards compatibility. Definitely would need docs, however.

# include <complex>
# define FFTW_DEFINE_COMPLEX(R, C) typedef ::std::complex<R> C
Copy link
Contributor

@stevengj stevengj Feb 9, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naive question: What is the difference between ::std::complex and std::complex here?

# endif
extern "C"
{
#endif /* __cplusplus */

#ifndef FFTW_DEFINE_COMPLEX
/* If <complex.h> is included, use the C99 complex type. Otherwise
define a type bit-compatible with C99 complex */
#if !defined(FFTW_NO_Complex) && defined(_Complex_I) && defined(complex) && defined(I)
# define FFTW_DEFINE_COMPLEX(R, C) typedef R _Complex C
#else
# define FFTW_DEFINE_COMPLEX(R, C) typedef R C[2]
# if !defined(FFTW_NO_Complex) && defined(_Complex_I) && defined(complex) && defined(I)
# define FFTW_DEFINE_COMPLEX(R, C) typedef R _Complex C
# else
# define FFTW_DEFINE_COMPLEX(R, C) typedef R C[2]
# endif
#endif

#define FFTW_CONCAT(prefix, name) prefix ## name
Expand Down