Mercurial > octave
diff libinterp/dldfcn/fftw.cc @ 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 32c3a5805893 |
| children | 796f54d4ddbf |
line wrap: on
line diff
--- a/libinterp/dldfcn/fftw.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/fftw.cc Sat Aug 14 22:48:52 2021 -0400 @@ -162,65 +162,65 @@ std::string arg1 = args(1).xstring_value ("fftw: METHOD must be a string"); std::transform (arg1.begin (), arg1.end (), arg1.begin (), tolower); - octave::fftw_planner::FftwMethod meth - = octave::fftw_planner::UNKNOWN; - octave::float_fftw_planner::FftwMethod methf - = octave::float_fftw_planner::UNKNOWN; + fftw_planner::FftwMethod meth + = fftw_planner::UNKNOWN; + float_fftw_planner::FftwMethod methf + = float_fftw_planner::UNKNOWN; if (arg1 == "estimate") { - meth = octave::fftw_planner::ESTIMATE; - methf = octave::float_fftw_planner::ESTIMATE; + meth = fftw_planner::ESTIMATE; + methf = float_fftw_planner::ESTIMATE; } else if (arg1 == "measure") { - meth = octave::fftw_planner::MEASURE; - methf = octave::float_fftw_planner::MEASURE; + meth = fftw_planner::MEASURE; + methf = float_fftw_planner::MEASURE; } else if (arg1 == "patient") { - meth = octave::fftw_planner::PATIENT; - methf = octave::float_fftw_planner::PATIENT; + meth = fftw_planner::PATIENT; + methf = float_fftw_planner::PATIENT; } else if (arg1 == "exhaustive") { - meth = octave::fftw_planner::EXHAUSTIVE; - methf = octave::float_fftw_planner::EXHAUSTIVE; + meth = fftw_planner::EXHAUSTIVE; + methf = float_fftw_planner::EXHAUSTIVE; } else if (arg1 == "hybrid") { - meth = octave::fftw_planner::HYBRID; - methf = octave::float_fftw_planner::HYBRID; + meth = fftw_planner::HYBRID; + methf = float_fftw_planner::HYBRID; } else error ("fftw: unrecognized planner METHOD"); - meth = octave::fftw_planner::method (meth); - octave::float_fftw_planner::method (methf); + meth = fftw_planner::method (meth); + float_fftw_planner::method (methf); - if (meth == octave::fftw_planner::MEASURE) + if (meth == fftw_planner::MEASURE) retval = octave_value ("measure"); - else if (meth == octave::fftw_planner::PATIENT) + else if (meth == fftw_planner::PATIENT) retval = octave_value ("patient"); - else if (meth == octave::fftw_planner::EXHAUSTIVE) + else if (meth == fftw_planner::EXHAUSTIVE) retval = octave_value ("exhaustive"); - else if (meth == octave::fftw_planner::HYBRID) + else if (meth == fftw_planner::HYBRID) retval = octave_value ("hybrid"); else retval = octave_value ("estimate"); } else //planner getter { - octave::fftw_planner::FftwMethod meth - = octave::fftw_planner::method (); + fftw_planner::FftwMethod meth + = fftw_planner::method (); - if (meth == octave::fftw_planner::MEASURE) + if (meth == fftw_planner::MEASURE) retval = octave_value ("measure"); - else if (meth == octave::fftw_planner::PATIENT) + else if (meth == fftw_planner::PATIENT) retval = octave_value ("patient"); - else if (meth == octave::fftw_planner::EXHAUSTIVE) + else if (meth == fftw_planner::EXHAUSTIVE) retval = octave_value ("exhaustive"); - else if (meth == octave::fftw_planner::HYBRID) + else if (meth == fftw_planner::HYBRID) retval = octave_value ("hybrid"); else retval = octave_value ("estimate"); @@ -309,19 +309,19 @@ error ("fftw: number of threads must be >=1"); #if defined (HAVE_FFTW3_THREADS) - octave::fftw_planner::threads (nthreads); + fftw_planner::threads (nthreads); #else err_disabled_feature ("fftw", "multithreaded FFTW"); #endif #if defined (HAVE_FFTW3F_THREADS) - octave::float_fftw_planner::threads (nthreads); + float_fftw_planner::threads (nthreads); #else err_disabled_feature ("fftw", "multithreaded FFTW"); #endif } else //threads getter #if defined (HAVE_FFTW3_THREADS) - retval = octave_value (octave::fftw_planner::threads()); + retval = octave_value (fftw_planner::threads()); #else retval = 1; #endif