Mercurial > octave

comparison libinterp/octave-value/ov-fcn-handle.h @ 29960:939bef0b66e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks In files with both OCTAVE_NAMESPACE_BEGIN/END and "namespace octave" blocks, merge adjacent blocks. Use the macros in place of "namespace octave" in affected files and the corresponding header files. Files affected: call-stack.cc, call-stack.h, defaults.cc, defaults.h, defun-int.h, display.cc, display.h, environment.cc, environment.h, error.cc, error.h, event-manager.cc, event-manager.h, fcn-info.cc, fcn-info.h, help.cc, help.h, input.cc, input.h, interpreter.cc, interpreter.h, load-path.cc, load-path.h, load-save.cc, load-save.h, oct-hist.cc, oct-hist.h, pager.cc, pager.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, utils.cc, utils.h, __ode15__.cc, gzip.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-java.cc, ov-java.h, ov-typeinfo.cc, ov-typeinfo.h, ov.cc, ov.h, octave.cc, octave.h, lex.ll, oct-parse.yy, profiler.cc, profiler.h, pt-eval.cc, and pt-eval.h.
author John W. Eaton <jwe@octave.org>
date Sat, 14 Aug 2021 21:50:26 -0400
parents 4c88a452519c
children eff73c13fcf3 796f54d4ddbf
comparison
equal deleted inserted replaced
29959:9e35973fb6c0 29960:939bef0b66e0
38 #include "ov-fcn.h" 38 #include "ov-fcn.h"
39 #include "ov-typeinfo.h" 39 #include "ov-typeinfo.h"
40 #include "stack-frame.h" 40 #include "stack-frame.h"
41 #include "symscope.h" 41 #include "symscope.h"
42 42
43 namespace octave 43 OCTAVE_NAMESPACE_BEGIN
44 { 44
45 class interpreter; 45 class interpreter;
46 class tree_evaluator; 46 class tree_evaluator;
47 47
48 // Function handles. 48 // Function handles.
49 49
166 std::string m_name; 166 std::string m_name;
167 167
168 // The name of the file where the named function was defined. 168 // The name of the file where the named function was defined.
169 std::string m_file; 169 std::string m_file;
170 }; 170 };
171 } 171
172 OCTAVE_NAMESPACE_END
172 173
173 class 174 class
174 OCTINTERP_API 175 OCTINTERP_API
175 octave_fcn_handle : public octave_base_value 176 octave_fcn_handle : public octave_base_value
176 { 177 {
370 }; 371 };
371 372
372 extern bool 373 extern bool
373 is_equal_to (const octave_fcn_handle& fh1, const octave_fcn_handle& fh2); 374 is_equal_to (const octave_fcn_handle& fh1, const octave_fcn_handle& fh2);
374 375
375 namespace octave 376 OCTAVE_NAMESPACE_BEGIN
376 { 377
377 #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS) 378 #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
378 OCTAVE_DEPRECATED (6, "use 'tree_evaluator::make_fcn_handle' instead") 379 OCTAVE_DEPRECATED (6, "use 'tree_evaluator::make_fcn_handle' instead")
379 extern octave_value 380 extern octave_value
380 make_fcn_handle (interpreter& interp, const std::string& name); 381 make_fcn_handle (interpreter& interp, const std::string& name);
381 #endif 382 #endif
382 } 383
384 OCTAVE_NAMESPACE_END
383 385
384 #endif 386 #endif