# HG changeset patch # User John W. Eaton # Date 1608100437 18000 # Wed Dec 16 01:33:57 2020 -0500 # Node ID 71dfe53d7114bb54e5ec58c0e850119b801c50a5 # Parent 743da1f051acfc6055c87a5b9be662261093415c tmp-visibility-2 diff --git a/build-aux/mk-octave-config-h.sh b/build-aux/mk-octave-config-h.sh --- a/build-aux/mk-octave-config-h.sh +++ b/build-aux/mk-octave-config-h.sh @@ -192,7 +192,6 @@ octave_unused_parameter (const T&) # endif # define OCTAVE_API OCTAVE_IMPORT -# define OCTINTERP_API OCTAVE_IMPORT EOF octave_idx_type="`$SED -n 's/#define OCTAVE_IDX_TYPE \([_a-zA-Z][_a-zA-Z0-9]*\)/\1/p' $config_h_file`" diff --git a/libgui/liboctgui-build-info.h b/libgui/liboctgui-build-info.h --- a/libgui/liboctgui-build-info.h +++ b/libgui/liboctgui-build-info.h @@ -32,6 +32,6 @@ #include -extern OCTGUI_API std::string liboctgui_hg_id (void); +extern OCTAVE_API std::string liboctgui_hg_id (void); #endif diff --git a/libgui/src/qt-application.h b/libgui/src/qt-application.h --- a/libgui/src/qt-application.h +++ b/libgui/src/qt-application.h @@ -41,7 +41,7 @@ namespace octave //! allows Qt graphics to be used or it may start an interface that //! provides the full GUI experience. - class OCTGUI_API qt_application : public application + class OCTAVE_API qt_application : public application { public: diff --git a/libinterp/build-env.h b/libinterp/build-env.h --- a/libinterp/build-env.h +++ b/libinterp/build-env.h @@ -34,7 +34,7 @@ namespace octave { namespace build_env { - extern OCTINTERP_API octave_scalar_map features (void); + extern OCTAVE_API octave_scalar_map features (void); extern const char *AMD_CPPFLAGS; extern const char *AMD_LDFLAGS; diff --git a/libinterp/corefcn/Cell.h b/libinterp/corefcn/Cell.h --- a/libinterp/corefcn/Cell.h +++ b/libinterp/corefcn/Cell.h @@ -38,7 +38,7 @@ class octave_value_list; class -OCTINTERP_API +OCTAVE_API Cell : public Array { public: diff --git a/libinterp/corefcn/call-stack.h b/libinterp/corefcn/call-stack.h --- a/libinterp/corefcn/call-stack.h +++ b/libinterp/corefcn/call-stack.h @@ -51,7 +51,7 @@ namespace octave class unwind_protect; class - OCTINTERP_API + OCTAVE_API call_stack { public: diff --git a/libinterp/corefcn/cdisplay.h b/libinterp/corefcn/cdisplay.h --- a/libinterp/corefcn/cdisplay.h +++ b/libinterp/corefcn/cdisplay.h @@ -32,7 +32,7 @@ extern "C" { #endif -extern OCTINTERP_API const char * +extern OCTAVE_API const char * octave_get_display_info (const char *dpy_name, int *ht, int *wd, int *dp, double *rx, double *ry, int *dpy_avail); diff --git a/libinterp/corefcn/data.h b/libinterp/corefcn/data.h --- a/libinterp/corefcn/data.h +++ b/libinterp/corefcn/data.h @@ -33,7 +33,7 @@ class octave_value; class octave_value_list; -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value do_class_concat (const octave_value_list& ovl, std::string cattype, int dim); #endif diff --git a/libinterp/corefcn/defaults.h b/libinterp/corefcn/defaults.h --- a/libinterp/corefcn/defaults.h +++ b/libinterp/corefcn/defaults.h @@ -36,71 +36,71 @@ namespace octave { namespace config { - extern OCTINTERP_API std::string + extern OCTAVE_API std::string prepend_octave_home (const std::string& s); - extern OCTINTERP_API std::string + extern OCTAVE_API std::string prepend_octave_exec_home (const std::string& s); // These could be defined as pure constants, but we'll use // functions to be consistent with the values that require // initialization. - extern OCTINTERP_API std::string canonical_host_type (void); - extern OCTINTERP_API std::string release (void); - extern OCTINTERP_API std::string default_pager (void); + extern OCTAVE_API std::string canonical_host_type (void); + extern OCTAVE_API std::string release (void); + extern OCTAVE_API std::string default_pager (void); // These require initialization, so can't be defined as pure // constants. We use functions to access these values so that // they can't be modified by users. - extern OCTINTERP_API std::string octave_home (void); - extern OCTINTERP_API std::string octave_exec_home (void); + extern OCTAVE_API std::string octave_home (void); + extern OCTAVE_API std::string octave_exec_home (void); - extern OCTINTERP_API std::string bin_dir (void); - extern OCTINTERP_API std::string data_dir (void); - extern OCTINTERP_API std::string dataroot_dir (void); - extern OCTINTERP_API std::string include_dir (void); - extern OCTINTERP_API std::string lib_dir (void); - extern OCTINTERP_API std::string libexec_dir (void); + extern OCTAVE_API std::string bin_dir (void); + extern OCTAVE_API std::string data_dir (void); + extern OCTAVE_API std::string dataroot_dir (void); + extern OCTAVE_API std::string include_dir (void); + extern OCTAVE_API std::string lib_dir (void); + extern OCTAVE_API std::string libexec_dir (void); - extern OCTINTERP_API std::string local_ver_arch_lib_dir (void); - extern OCTINTERP_API std::string local_api_arch_lib_dir (void); - extern OCTINTERP_API std::string local_arch_lib_dir (void); - extern OCTINTERP_API std::string arch_lib_dir (void); + extern OCTAVE_API std::string local_ver_arch_lib_dir (void); + extern OCTAVE_API std::string local_api_arch_lib_dir (void); + extern OCTAVE_API std::string local_arch_lib_dir (void); + extern OCTAVE_API std::string arch_lib_dir (void); - extern OCTINTERP_API std::string local_ver_oct_file_dir (void); - extern OCTINTERP_API std::string local_api_oct_file_dir (void); - extern OCTINTERP_API std::string local_oct_file_dir (void); - extern OCTINTERP_API std::string oct_file_dir (void); + extern OCTAVE_API std::string local_ver_oct_file_dir (void); + extern OCTAVE_API std::string local_api_oct_file_dir (void); + extern OCTAVE_API std::string local_oct_file_dir (void); + extern OCTAVE_API std::string oct_file_dir (void); - extern OCTINTERP_API std::string local_ver_fcn_file_dir (void); - extern OCTINTERP_API std::string local_api_fcn_file_dir (void); - extern OCTINTERP_API std::string local_fcn_file_dir (void); - extern OCTINTERP_API std::string fcn_file_dir (void); + extern OCTAVE_API std::string local_ver_fcn_file_dir (void); + extern OCTAVE_API std::string local_api_fcn_file_dir (void); + extern OCTAVE_API std::string local_fcn_file_dir (void); + extern OCTAVE_API std::string fcn_file_dir (void); - extern OCTINTERP_API std::string oct_data_dir (void); - extern OCTINTERP_API std::string oct_doc_dir (void); - extern OCTINTERP_API std::string oct_etc_dir (void); - extern OCTINTERP_API std::string oct_fonts_dir (void); - extern OCTINTERP_API std::string oct_include_dir (void); - extern OCTINTERP_API std::string oct_lib_dir (void); - extern OCTINTERP_API std::string oct_locale_dir (void); - extern OCTINTERP_API std::string oct_tests_dir (void); + extern OCTAVE_API std::string oct_data_dir (void); + extern OCTAVE_API std::string oct_doc_dir (void); + extern OCTAVE_API std::string oct_etc_dir (void); + extern OCTAVE_API std::string oct_fonts_dir (void); + extern OCTAVE_API std::string oct_include_dir (void); + extern OCTAVE_API std::string oct_lib_dir (void); + extern OCTAVE_API std::string oct_locale_dir (void); + extern OCTAVE_API std::string oct_tests_dir (void); - extern OCTINTERP_API std::string info_dir (void); + extern OCTAVE_API std::string info_dir (void); - extern OCTINTERP_API std::string man_dir (void); - extern OCTINTERP_API std::string man1_dir (void); - extern OCTINTERP_API std::string man1_ext (void); + extern OCTAVE_API std::string man_dir (void); + extern OCTAVE_API std::string man1_dir (void); + extern OCTAVE_API std::string man1_ext (void); - extern OCTINTERP_API std::string image_dir (void); + extern OCTAVE_API std::string image_dir (void); - extern OCTINTERP_API std::string local_startupfile_dir (void); - extern OCTINTERP_API std::string startupfile_dir (void); + extern OCTAVE_API std::string local_startupfile_dir (void); + extern OCTAVE_API std::string startupfile_dir (void); - extern OCTINTERP_API std::string local_site_defaults_file (void); - extern OCTINTERP_API std::string site_defaults_file (void); + extern OCTAVE_API std::string local_site_defaults_file (void); + extern OCTAVE_API std::string site_defaults_file (void); } } diff --git a/libinterp/corefcn/defun-int.h b/libinterp/corefcn/defun-int.h --- a/libinterp/corefcn/defun-int.h +++ b/libinterp/corefcn/defun-int.h @@ -41,27 +41,27 @@ namespace octave class octave_value; -extern OCTINTERP_API void print_usage (void); -extern OCTINTERP_API void print_usage (const std::string&); +extern OCTAVE_API void print_usage (void); +extern OCTAVE_API void print_usage (const std::string&); -extern OCTINTERP_API void check_version (const std::string& version, +extern OCTAVE_API void check_version (const std::string& version, const std::string& fcn); -extern OCTINTERP_API void +extern OCTAVE_API void install_dld_function (octave_dld_function::fcn f, const std::string& name, const octave::dynamic_library& shl, const std::string& doc, bool relative = false); -extern OCTINTERP_API void +extern OCTAVE_API void install_dld_function (octave_dld_function::meth m, const std::string& name, const octave::dynamic_library& shl, const std::string& doc, bool relative = false); -extern OCTINTERP_API void +extern OCTAVE_API void install_mex_function (void *fptr, bool fmex, const std::string& name, const octave::dynamic_library& shl, bool relative = false); // Gets the shlib of the currently executing DLD function, if any. -extern OCTINTERP_API octave::dynamic_library +extern OCTAVE_API octave::dynamic_library get_current_shlib (void); namespace octave diff --git a/libinterp/corefcn/error.h b/libinterp/corefcn/error.h --- a/libinterp/corefcn/error.h +++ b/libinterp/corefcn/error.h @@ -45,7 +45,7 @@ namespace octave namespace octave { class - OCTINTERP_API + OCTAVE_API error_system { public: @@ -382,119 +382,119 @@ namespace octave #define panic_impossible() \ panic ("impossible state reached in file '%s' at line %d", __FILE__, __LINE__) -extern OCTINTERP_API int warning_enabled (const std::string& id); +extern OCTAVE_API int warning_enabled (const std::string& id); -extern OCTINTERP_API void +extern OCTAVE_API void vmessage (const char *name, const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (2, 3) -extern OCTINTERP_API void message (const char *name, const char *fmt, ...); +extern OCTAVE_API void message (const char *name, const char *fmt, ...); -extern OCTINTERP_API void vwarning (const char *fmt, va_list args); +extern OCTAVE_API void vwarning (const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (1, 2) -extern OCTINTERP_API void warning (const char *fmt, ...); +extern OCTAVE_API void warning (const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void verror (const char *fmt, va_list args); +extern OCTAVE_API void verror (const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (1, 2) OCTAVE_NORETURN -extern OCTINTERP_API void error (const char *fmt, ...); +extern OCTAVE_API void error (const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void verror (octave::execution_exception&, const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (2, 3) OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void error (octave::execution_exception&, const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void verror_with_cfn (const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (1, 2) OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void error_with_cfn (const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void vparse_error (const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (1, 2) OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void parse_error (const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void vusage_with_id (const char *id, const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (2, 3) OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void usage_with_id (const char *id, const char *fmt, ...); -extern OCTINTERP_API void +extern OCTAVE_API void vwarning_with_id (const char *id, const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (2, 3) -extern OCTINTERP_API void +extern OCTAVE_API void warning_with_id (const char *id, const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void verror_with_id (const char *id, const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (2, 3) OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void error_with_id (const char *id, const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void verror_with_id_cfn (const char *id, const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (2, 3) OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void error_with_id_cfn (const char *id, const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void vparse_error_with_id (const char *id, const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (2, 3) OCTAVE_NORETURN -extern OCTINTERP_API void +extern OCTAVE_API void parse_error_with_id (const char *id, const char *fmt, ...); OCTAVE_NORETURN -extern OCTINTERP_API void vpanic (const char *fmt, va_list args); +extern OCTAVE_API void vpanic (const char *fmt, va_list args); OCTAVE_FORMAT_PRINTF (1, 2) OCTAVE_NORETURN -extern OCTINTERP_API void panic (const char *fmt, ...); +extern OCTAVE_API void panic (const char *fmt, ...); //! Helper function for print_usage defined in defun.cc. -extern OCTINTERP_API void defun_usage_message (const std::string& msg); +extern OCTAVE_API void defun_usage_message (const std::string& msg); -extern OCTINTERP_API octave_value_list +extern OCTAVE_API octave_value_list set_warning_state (const std::string& id, const std::string& state); -extern OCTINTERP_API octave_value_list +extern OCTAVE_API octave_value_list set_warning_state (const octave_value_list& args); -extern OCTINTERP_API void disable_warning (const std::string& id); +extern OCTAVE_API void disable_warning (const std::string& id); -extern OCTINTERP_API void interpreter_try (octave::unwind_protect&); +extern OCTAVE_API void interpreter_try (octave::unwind_protect&); OCTAVE_DEPRECATED (6, "this variable is obsolete and always has the value 0") -extern OCTINTERP_API int error_state; +extern OCTAVE_API int error_state; OCTAVE_DEPRECATED (6, "this function is obsolete and should not be needed") inline void reset_error_handler (void) { } diff --git a/libinterp/corefcn/errwarn.h b/libinterp/corefcn/errwarn.h --- a/libinterp/corefcn/errwarn.h +++ b/libinterp/corefcn/errwarn.h @@ -42,150 +42,150 @@ namespace octave // Alphabetized list of common errors and warnings. //////////////////////////////////////////////////////////////////////////////// -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_2_or_3_dim_plot (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_data_conversion (const char *from, const char *to); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_disabled_feature (const std::string& fcn, const std::string& feature, const std::string& pkg = "Octave"); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_indexed_cs_list (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_invalid_conversion (const std::string& from, const std::string& to); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_invalid_inquiry_subscript (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_invalid_structure_assignment (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_nonbraced_cs_list_assignment (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_nonconformant (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_nonconformant (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_not_implemented (const char *); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_range_invalid (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_square_matrix_required (const char *fcn, const char *name); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_string_invalid (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_unrecognized_data_fmt (const char *name); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_unrecognized_float_fmt (void); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_user_returned_invalid (const char *name); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_user_supplied_eval (const char *name); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_user_supplied_eval (octave::execution_exception& ee, const char *name); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (const char *name, const char *s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (octave::execution_exception& ee, const char *name, const char *s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (const char *name, const std::string& s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (octave::execution_exception& ee, const char *name, const std::string& s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (const char *name, const octave_value& tc); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (octave::execution_exception& ee, const char *name, const octave_value& tc); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (const std::string& name, const octave_value& tc); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (octave::execution_exception& ee, const std::string& name, const octave_value& tc); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (const char *s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (octave::execution_exception& ee, const char *s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (const std::string& s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (octave::execution_exception& ee, const std::string& s); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (const octave_value& tc); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg (octave::execution_exception& ee, const octave_value& tc); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg_for_binary_op (const octave_value& op); -OCTAVE_NORETURN extern OCTINTERP_API void +OCTAVE_NORETURN extern OCTAVE_API void err_wrong_type_arg_for_unary_op (const octave_value& op); -extern OCTINTERP_API void +extern OCTAVE_API void warn_array_as_logical (const dim_vector& dv); -extern OCTINTERP_API void +extern OCTAVE_API void warn_complex_cmp (void); -extern OCTINTERP_API void +extern OCTAVE_API void warn_data_file_in_path (const std::string& fcn, const std::string& file); -extern OCTINTERP_API void +extern OCTAVE_API void warn_disabled_feature (const std::string& fcn, const std::string& feature, const std::string& pkg = "Octave"); -extern OCTINTERP_API void +extern OCTAVE_API void warn_empty_arg (const char *name); -extern OCTINTERP_API void +extern OCTAVE_API void warn_empty_index (const std::string& type_name); -extern OCTINTERP_API void +extern OCTAVE_API void warn_implicit_conversion (const char *id, const char *from, const char *to); -extern OCTINTERP_API void +extern OCTAVE_API void warn_implicit_conversion (const std::string& id, const std::string& from, const std::string& to); -extern OCTINTERP_API void +extern OCTAVE_API void warn_invalid_value_specified (const char *name); -extern OCTINTERP_API void +extern OCTAVE_API void warn_logical_conversion (void); -extern OCTINTERP_API void +extern OCTAVE_API void warn_wrong_type_arg (const char *name, const octave_value& tc); #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) diff --git a/libinterp/corefcn/event-manager.h b/libinterp/corefcn/event-manager.h --- a/libinterp/corefcn/event-manager.h +++ b/libinterp/corefcn/event-manager.h @@ -74,7 +74,7 @@ namespace octave // all necessary and whether there might be better names for them. class - OCTINTERP_API + OCTAVE_API interpreter_events { public: @@ -254,7 +254,7 @@ namespace octave //! interpreter and a GUI. class - OCTINTERP_API + OCTAVE_API event_manager { public: diff --git a/libinterp/corefcn/fcn-info.h b/libinterp/corefcn/fcn-info.h --- a/libinterp/corefcn/fcn-info.h +++ b/libinterp/corefcn/fcn-info.h @@ -356,10 +356,10 @@ namespace octave std::shared_ptr m_rep; }; - extern OCTINTERP_API std::string + extern OCTAVE_API std::string get_dispatch_type (const octave_value_list& args); - extern OCTINTERP_API std::string + extern OCTAVE_API std::string get_dispatch_type (const octave_value_list& args, builtin_type_t& builtin_type); diff --git a/libinterp/corefcn/file-io.h b/libinterp/corefcn/file-io.h --- a/libinterp/corefcn/file-io.h +++ b/libinterp/corefcn/file-io.h @@ -33,9 +33,9 @@ #include OCTAVE_DEPRECATED (6, "use 'interpreter::mark_for_deletion' instead") -extern OCTINTERP_API void mark_for_deletion (const std::string&); +extern OCTAVE_API void mark_for_deletion (const std::string&); OCTAVE_DEPRECATED (6, "use 'interpreter::cleanup_tmp_files' instead") -extern OCTINTERP_API void cleanup_tmp_files (void); +extern OCTAVE_API void cleanup_tmp_files (void); #endif diff --git a/libinterp/corefcn/ft-text-renderer.cc b/libinterp/corefcn/ft-text-renderer.cc --- a/libinterp/corefcn/ft-text-renderer.cc +++ b/libinterp/corefcn/ft-text-renderer.cc @@ -437,7 +437,7 @@ namespace octave } class - OCTINTERP_API + OCTAVE_API ft_text_renderer : public base_text_renderer { public: diff --git a/libinterp/corefcn/gl-render.h b/libinterp/corefcn/gl-render.h --- a/libinterp/corefcn/gl-render.h +++ b/libinterp/corefcn/gl-render.h @@ -36,7 +36,7 @@ namespace octave class opengl_functions; class - OCTINTERP_API + OCTAVE_API opengl_renderer { public: diff --git a/libinterp/corefcn/gl2ps-print.cc b/libinterp/corefcn/gl2ps-print.cc --- a/libinterp/corefcn/gl2ps-print.cc +++ b/libinterp/corefcn/gl2ps-print.cc @@ -57,7 +57,7 @@ namespace octave { class - OCTINTERP_API + OCTAVE_API gl2ps_renderer : public opengl_renderer { public: diff --git a/libinterp/corefcn/gl2ps-print.h b/libinterp/corefcn/gl2ps-print.h --- a/libinterp/corefcn/gl2ps-print.h +++ b/libinterp/corefcn/gl2ps-print.h @@ -36,7 +36,7 @@ namespace octave { class opengl_functions; - extern OCTINTERP_API void + extern OCTAVE_API void gl2ps_print (opengl_functions& glfcns, const graphics_object& fig, const std::string& stream, const std::string& term); } diff --git a/libinterp/corefcn/graphics.in.h b/libinterp/corefcn/graphics.in.h --- a/libinterp/corefcn/graphics.in.h +++ b/libinterp/corefcn/graphics.in.h @@ -320,7 +320,7 @@ public: // Sets property value, notifies graphics toolkit. // If do_run is true, runs associated listeners. - OCTINTERP_API bool set (const octave_value& v, bool do_run = true, + OCTAVE_API bool set (const octave_value& v, bool do_run = true, bool do_notify_toolkit = true); virtual octave_value get (void) const @@ -401,7 +401,7 @@ public: } - OCTINTERP_API void run_listeners (listener_mode mode = GCB_POSTSET); + OCTAVE_API void run_listeners (listener_mode mode = GCB_POSTSET); virtual base_property * clone (void) const { return new base_property (*this); } @@ -841,7 +841,7 @@ private: class radio_values { public: - OCTINTERP_API radio_values (const std::string& opt_string = ""); + OCTAVE_API radio_values (const std::string& opt_string = ""); radio_values (const radio_values& a) : default_val (a.default_val), possible_vals (a.possible_vals) { } @@ -1055,7 +1055,7 @@ public: private: Matrix xrgb; - OCTINTERP_API bool str2rgb (const std::string& str); + OCTAVE_API bool str2rgb (const std::string& str); }; class color_property : public base_property @@ -1154,7 +1154,7 @@ public: Cell values_as_cell (void) const { return radio_val.values_as_cell (); } protected: - OCTINTERP_API bool do_set (const octave_value& newval); + OCTAVE_API bool do_set (const octave_value& newval); private: enum current_enum { color_t, radio_t } current_type; @@ -1355,7 +1355,7 @@ public: { return new double_radio_property (*this); } protected: - OCTINTERP_API bool do_set (const octave_value& v); + OCTAVE_API bool do_set (const octave_value& v); private: enum current_enum { double_t, radio_t } current_type; @@ -1479,11 +1479,11 @@ protected: } private: - OCTINTERP_API bool validate (const octave_value& v); - - OCTINTERP_API bool is_equal (const octave_value& v) const; - - OCTINTERP_API void get_data_limits (void); + OCTAVE_API bool validate (const octave_value& v); + + OCTAVE_API bool is_equal (const octave_value& v) const; + + OCTAVE_API void get_data_limits (void); protected: octave_value data; @@ -1586,7 +1586,7 @@ protected: } private: - OCTINTERP_API bool validate (const octave_value& v); + OCTAVE_API bool validate (const octave_value& v); }; // --------------------------------------------------------------------- @@ -1666,7 +1666,7 @@ public: { type_constraints.insert (type); } protected: - OCTINTERP_API bool do_set (const octave_value& v); + OCTAVE_API bool do_set (const octave_value& v); std::set type_constraints; private: @@ -1863,7 +1863,7 @@ private: children_list = val; } - OCTINTERP_API Matrix do_get_children (bool return_hidden) const; + OCTAVE_API Matrix do_get_children (bool return_hidden) const; Matrix do_get_all_children (void) const { @@ -1911,7 +1911,7 @@ public: octave_value get (void) const { return callback; } - OCTINTERP_API void execute (const octave_value& data = octave_value ()) const; + OCTAVE_API void execute (const octave_value& data = octave_value ()) const; bool is_defined (void) const { @@ -1939,7 +1939,7 @@ protected: } private: - OCTINTERP_API bool validate (const octave_value& v) const; + OCTAVE_API bool validate (const octave_value& v) const; private: octave_value callback; @@ -2037,7 +2037,7 @@ public: void run_listeners (listener_mode mode = GCB_POSTSET) { rep->run_listeners (mode); } - OCTINTERP_API static + OCTAVE_API static property create (const std::string& name, const graphics_handle& parent, const caseless_str& type, const octave_value_list& args); @@ -2174,7 +2174,7 @@ public: return plist_map.find (go_name); } - OCTINTERP_API octave_scalar_map + OCTAVE_API octave_scalar_map as_struct (const std::string& prefix_arg) const; private: @@ -2186,7 +2186,7 @@ private: class base_graphics_object; class graphics_object; -class OCTINTERP_API base_properties +class OCTAVE_API base_properties { public: base_properties (const std::string& ty = "unknown", @@ -2449,7 +2449,7 @@ protected: } }; -class OCTINTERP_API base_graphics_object +class OCTAVE_API base_graphics_object { public: friend class graphics_object; @@ -2706,7 +2706,7 @@ protected: bool toolkit_flag; }; -class OCTINTERP_API graphics_object +class OCTAVE_API graphics_object { public: @@ -2930,7 +2930,7 @@ private: // --------------------------------------------------------------------- -class OCTINTERP_API root_figure : public base_graphics_object +class OCTAVE_API root_figure : public base_graphics_object { public: @@ -2939,7 +2939,7 @@ public: friend class gh_manager; - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: void remove_child (const graphics_handle& h, bool from_root = false); @@ -3108,11 +3108,11 @@ private: // --------------------------------------------------------------------- -class OCTINTERP_API figure : public base_graphics_object +class OCTAVE_API figure : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: void init_integerhandle (const octave_value& val) @@ -3354,7 +3354,7 @@ private: // --------------------------------------------------------------------- -class OCTINTERP_API graphics_xform +class OCTAVE_API graphics_xform { public: @@ -3443,11 +3443,11 @@ enum AXE_VERT_DIR = 3 }; -class OCTINTERP_API axes : public base_graphics_object +class OCTAVE_API axes : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -4334,11 +4334,11 @@ private: // --------------------------------------------------------------------- -class OCTINTERP_API line : public base_graphics_object +class OCTAVE_API line : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -4417,11 +4417,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API text : public base_graphics_object +class OCTAVE_API text : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -4614,11 +4614,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API image : public base_graphics_object +class OCTAVE_API image : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -4829,11 +4829,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API light : public base_graphics_object +class OCTAVE_API light : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { // See the genprops.awk script for an explanation of the // properties declarations. @@ -4885,11 +4885,11 @@ protected: // --------------------------------------------------------------------- -class OCTINTERP_API patch : public base_graphics_object +class OCTAVE_API patch : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -5158,11 +5158,11 @@ protected: // --------------------------------------------------------------------- -class OCTINTERP_API scatter : public base_graphics_object +class OCTAVE_API scatter : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -5392,11 +5392,11 @@ protected: // --------------------------------------------------------------------- -class OCTINTERP_API surface : public base_graphics_object +class OCTAVE_API surface : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -5602,11 +5602,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API hggroup : public base_graphics_object +class OCTAVE_API hggroup : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -5678,11 +5678,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API uimenu : public base_graphics_object +class OCTAVE_API uimenu : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -5751,11 +5751,11 @@ public: // --------------------------------------------------------------------- // FIXME: This class has been renamed to "contextmenu" in Matlab R2020a. -class OCTINTERP_API uicontextmenu : public base_graphics_object +class OCTAVE_API uicontextmenu : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -5823,11 +5823,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API uicontrol : public base_graphics_object +class OCTAVE_API uicontrol : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -5933,11 +5933,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API uibuttongroup : public base_graphics_object +class OCTAVE_API uibuttongroup : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -6031,11 +6031,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API uipanel : public base_graphics_object +class OCTAVE_API uipanel : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -6113,11 +6113,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API uitable : public base_graphics_object +class OCTAVE_API uitable : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -6219,11 +6219,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API uitoolbar : public base_graphics_object +class OCTAVE_API uitoolbar : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -6322,11 +6322,11 @@ private: // --------------------------------------------------------------------- -class OCTINTERP_API uipushtool : public base_graphics_object +class OCTAVE_API uipushtool : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -6385,11 +6385,11 @@ public: // --------------------------------------------------------------------- -class OCTINTERP_API uitoggletool : public base_graphics_object +class OCTAVE_API uitoggletool : public base_graphics_object { public: - class OCTINTERP_API properties : public base_properties + class OCTAVE_API properties : public base_properties { public: @@ -6549,7 +6549,7 @@ private: std::shared_ptr rep; }; -class OCTINTERP_API gh_manager +class OCTAVE_API gh_manager { public: @@ -6761,14 +6761,14 @@ void get_children_limits (double& min_va double& min_pos, double& max_neg, const Matrix& kids, char limit_type); -OCTINTERP_API int calc_dimensions (const graphics_object& gh); +OCTAVE_API int calc_dimensions (const graphics_object& gh); // This function is NOT equivalent to the scripting language function gcf. -OCTINTERP_API graphics_handle gcf (void); +OCTAVE_API graphics_handle gcf (void); // This function is NOT equivalent to the scripting language function gca. -OCTINTERP_API graphics_handle gca (void); - -OCTINTERP_API void close_all_figures (void); +OCTAVE_API graphics_handle gca (void); + +OCTAVE_API void close_all_figures (void); #endif diff --git a/libinterp/corefcn/gtk-manager.h b/libinterp/corefcn/gtk-manager.h --- a/libinterp/corefcn/gtk-manager.h +++ b/libinterp/corefcn/gtk-manager.h @@ -37,7 +37,7 @@ namespace octave { - class OCTINTERP_API gtk_manager + class OCTAVE_API gtk_manager { public: diff --git a/libinterp/corefcn/input.h b/libinterp/corefcn/input.h --- a/libinterp/corefcn/input.h +++ b/libinterp/corefcn/input.h @@ -46,10 +46,10 @@ extern bool octave_completion_matches_ca // TRUE if the plotting system has requested a call to drawnow at // the next user prompt. -extern OCTINTERP_API bool Vdrawnow_requested; +extern OCTAVE_API bool Vdrawnow_requested; OCTAVE_DEPRECATED (6, "'Vtrack_line_num' is an obsolete internal variable; any uses should be removed") -extern OCTINTERP_API bool Vtrack_line_num; +extern OCTAVE_API bool Vtrack_line_num; extern octave::sys::time Vlast_prompt_time; diff --git a/libinterp/corefcn/interpreter.h b/libinterp/corefcn/interpreter.h --- a/libinterp/corefcn/interpreter.h +++ b/libinterp/corefcn/interpreter.h @@ -58,14 +58,14 @@ #include "symtab.h" #include "url-handle-manager.h" -extern OCTINTERP_API bool quit_allowed; +extern OCTAVE_API bool quit_allowed; // TRUE means we are ready to interpret commands, but not everything // is ready for interactive use. -extern OCTINTERP_API bool octave_interpreter_ready; +extern OCTAVE_API bool octave_interpreter_ready; // TRUE means we've processed all the init code and we are good to go. -extern OCTINTERP_API bool octave_initialized; +extern OCTAVE_API bool octave_initialized; #include "oct-time.h" @@ -109,7 +109,7 @@ namespace octave }; - class OCTINTERP_API interpreter + class OCTAVE_API interpreter { public: diff --git a/libinterp/corefcn/load-path.h b/libinterp/corefcn/load-path.h --- a/libinterp/corefcn/load-path.h +++ b/libinterp/corefcn/load-path.h @@ -42,7 +42,7 @@ namespace octave { class - OCTINTERP_API + OCTAVE_API load_path { public: diff --git a/libinterp/corefcn/ls-ascii-helper.h b/libinterp/corefcn/ls-ascii-helper.h --- a/libinterp/corefcn/ls-ascii-helper.h +++ b/libinterp/corefcn/ls-ascii-helper.h @@ -31,13 +31,13 @@ #include #include -extern OCTINTERP_API void +extern OCTAVE_API void skip_until_newline (std::istream& is, bool keep_newline = false); -extern OCTINTERP_API void +extern OCTAVE_API void skip_preceeding_newline (std::istream& is); -extern OCTINTERP_API std::string +extern OCTAVE_API std::string read_until_newline (std::istream& is, bool keep_newline = false); #endif diff --git a/libinterp/corefcn/ls-hdf5.h b/libinterp/corefcn/ls-hdf5.h --- a/libinterp/corefcn/ls-hdf5.h +++ b/libinterp/corefcn/ls-hdf5.h @@ -117,55 +117,55 @@ struct hdf5_callback_data std::string doc; }; -extern OCTINTERP_API octave_hdf5_id +extern OCTAVE_API octave_hdf5_id save_type_to_hdf5 (save_type st); -extern OCTINTERP_API octave_hdf5_id +extern OCTAVE_API octave_hdf5_id hdf5_make_complex_type (octave_hdf5_id num_type); -extern OCTINTERP_API bool +extern OCTAVE_API bool hdf5_types_compatible (octave_hdf5_id t1, octave_hdf5_id t2); -extern OCTINTERP_API octave_hdf5_err +extern OCTAVE_API octave_hdf5_err hdf5_read_next_data (octave_hdf5_id group_id, const char *name, void *dv); -extern OCTINTERP_API octave_hdf5_err +extern OCTAVE_API octave_hdf5_err hdf5_h5g_iterate (octave_hdf5_id loc_id, const char *name, int *idx, void *operator_data); -extern OCTINTERP_API bool +extern OCTAVE_API bool add_hdf5_data (octave_hdf5_id loc_id, const octave_value& tc, const std::string& name, const std::string& doc, bool mark_global, bool save_as_floats); -extern OCTINTERP_API int +extern OCTAVE_API int save_hdf5_empty (octave_hdf5_id loc_id, const char *name, const dim_vector& d); -extern OCTINTERP_API int +extern OCTAVE_API int load_hdf5_empty (octave_hdf5_id loc_id, const char *name, dim_vector& d); -extern OCTINTERP_API std::string +extern OCTAVE_API std::string read_hdf5_data (std::istream& is, const std::string& filename, bool& global, octave_value& tc, std::string& doc, const string_vector& argv, int argv_idx, int argc); -extern OCTINTERP_API bool +extern OCTAVE_API bool save_hdf5_data (std::ostream& os, const octave_value& tc, const std::string& name, const std::string& doc, bool mark_global, bool save_as_floats); -extern OCTINTERP_API bool +extern OCTAVE_API bool hdf5_check_attr (octave_hdf5_id loc_id, const char *attr_name); -extern OCTINTERP_API bool +extern OCTAVE_API bool hdf5_get_scalar_attr (octave_hdf5_id loc_id, octave_hdf5_id type_id, const char *attr_name, void *buf); -extern OCTINTERP_API octave_hdf5_err +extern OCTAVE_API octave_hdf5_err hdf5_add_attr (octave_hdf5_id loc_id, const char *attr_name); -extern OCTINTERP_API octave_hdf5_err +extern OCTAVE_API octave_hdf5_err hdf5_add_scalar_attr (octave_hdf5_id loc_id, octave_hdf5_id type_id, const char *attr_name, void *buf); diff --git a/libinterp/corefcn/ls-oct-binary.h b/libinterp/corefcn/ls-oct-binary.h --- a/libinterp/corefcn/ls-oct-binary.h +++ b/libinterp/corefcn/ls-oct-binary.h @@ -34,12 +34,12 @@ class octave_value; -extern OCTINTERP_API bool +extern OCTAVE_API bool save_binary_data (std::ostream& os, const octave_value& tc, const std::string& name, const std::string& doc, bool mark_global, bool save_as_floats); -extern OCTINTERP_API std::string +extern OCTAVE_API std::string read_binary_data (std::istream& is, bool swap, octave::mach_info::float_format fmt, const std::string& filename, bool& global, diff --git a/libinterp/corefcn/ls-oct-text.h b/libinterp/corefcn/ls-oct-text.h --- a/libinterp/corefcn/ls-oct-text.h +++ b/libinterp/corefcn/ls-oct-text.h @@ -47,24 +47,24 @@ class octave_value; # define OCT_RBV (std::numeric_limits::max () / 100.0) #endif -extern OCTINTERP_API std::string +extern OCTAVE_API std::string extract_keyword (std::istream& is, const char *keyword, const bool next_only = false); -extern OCTINTERP_API std::string +extern OCTAVE_API std::string read_text_data (std::istream& is, const std::string& filename, bool& global, octave_value& tc, octave_idx_type count, const bool do_name_validation = true); -extern OCTINTERP_API bool +extern OCTAVE_API bool save_text_data (std::ostream& os, const octave_value& val_arg, const std::string& name, bool mark_global, int precision); -extern OCTINTERP_API bool +extern OCTAVE_API bool save_text_data_for_plotting (std::ostream& os, const octave_value& t, const std::string& name); -extern OCTINTERP_API bool +extern OCTAVE_API bool save_three_d (std::ostream& os, const octave_value& t, bool parametric = false); diff --git a/libinterp/corefcn/mex.cc b/libinterp/corefcn/mex.cc --- a/libinterp/corefcn/mex.cc +++ b/libinterp/corefcn/mex.cc @@ -67,190 +67,190 @@ extern "C" { - extern OCTINTERP_API const mxArray * + extern OCTAVE_API const mxArray * mexGet_interleaved (double handle, const char *property); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCellArray (mwSize ndims, const mwSize *dims); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCellMatrix (mwSize m, mwSize n); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCharArray (mwSize ndims, const mwSize *dims); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCharMatrixFromStrings (mwSize m, const char **str); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateDoubleMatrix (mwSize nr, mwSize nc, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateDoubleScalar (double val); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateLogicalArray (mwSize ndims, const mwSize *dims); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateLogicalMatrix (mwSize m, mwSize n); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateLogicalScalar (mxLogical val); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateNumericArray (mwSize ndims, const mwSize *dims, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateNumericMatrix (mwSize m, mwSize n, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateUninitNumericArray (mwSize ndims, const mwSize *dims, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateUninitNumericMatrix (mwSize m, mwSize n, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateSparseLogicalMatrix (mwSize m, mwSize n, mwSize nzmax); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateString (const char *str); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateStructArray (mwSize ndims, const mwSize *dims, int num_keys, const char **keys); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateStructMatrix (mwSize rows, mwSize cols, int num_keys, const char **keys); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCellArray_interleaved (mwSize ndims, const mwSize *dims); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCellMatrix_interleaved (mwSize m, mwSize n); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCharArray_interleaved (mwSize ndims, const mwSize *dims); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateCharMatrixFromStrings_interleaved (mwSize m, const char **str); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateDoubleMatrix_interleaved (mwSize nr, mwSize nc, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateDoubleScalar_interleaved (double val); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateLogicalArray_interleaved (mwSize ndims, const mwSize *dims); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateLogicalMatrix_interleaved (mwSize m, mwSize n); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateLogicalScalar_interleaved (mxLogical val); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateNumericArray_interleaved (mwSize ndims, const mwSize *dims, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateNumericMatrix_interleaved (mwSize m, mwSize n, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateUninitNumericArray_interleaved (mwSize ndims, const mwSize *dims, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateUninitNumericMatrix_interleaved (mwSize m, mwSize n, mxClassID class_id, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateSparse_interleaved (mwSize m, mwSize n, mwSize nzmax, mxComplexity flag); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateSparseLogicalMatrix_interleaved (mwSize m, mwSize n, mwSize nzmax); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateString_interleaved (const char *str); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateStructArray_interleaved (mwSize ndims, const mwSize *dims, int num_keys, const char **keys); - extern OCTINTERP_API mxArray * + extern OCTAVE_API mxArray * mxCreateStructMatrix_interleaved (mwSize rows, mwSize cols, int num_keys, const char **keys); - extern OCTINTERP_API int mxMakeArrayReal (mxArray *ptr); - extern OCTINTERP_API int mxMakeArrayComplex (mxArray *ptr); - - extern OCTINTERP_API mxDouble * mxGetDoubles (const mxArray *p); - extern OCTINTERP_API mxSingle * mxGetSingles (const mxArray *p); - extern OCTINTERP_API mxInt8 * mxGetInt8s (const mxArray *p); - extern OCTINTERP_API mxInt16 * mxGetInt16s (const mxArray *p); - extern OCTINTERP_API mxInt32 * mxGetInt32s (const mxArray *p); - extern OCTINTERP_API mxInt64 * mxGetInt64s (const mxArray *p); - extern OCTINTERP_API mxUint8 * mxGetUint8s (const mxArray *p); - extern OCTINTERP_API mxUint16 * mxGetUint16s (const mxArray *p); - extern OCTINTERP_API mxUint32 * mxGetUint32s (const mxArray *p); - extern OCTINTERP_API mxUint64 * mxGetUint64s (const mxArray *p); - - extern OCTINTERP_API mxComplexDouble * mxGetComplexDoubles (const mxArray *p); - extern OCTINTERP_API mxComplexSingle * mxGetComplexSingles (const mxArray *p); + extern OCTAVE_API int mxMakeArrayReal (mxArray *ptr); + extern OCTAVE_API int mxMakeArrayComplex (mxArray *ptr); + + extern OCTAVE_API mxDouble * mxGetDoubles (const mxArray *p); + extern OCTAVE_API mxSingle * mxGetSingles (const mxArray *p); + extern OCTAVE_API mxInt8 * mxGetInt8s (const mxArray *p); + extern OCTAVE_API mxInt16 * mxGetInt16s (const mxArray *p); + extern OCTAVE_API mxInt32 * mxGetInt32s (const mxArray *p); + extern OCTAVE_API mxInt64 * mxGetInt64s (const mxArray *p); + extern OCTAVE_API mxUint8 * mxGetUint8s (const mxArray *p); + extern OCTAVE_API mxUint16 * mxGetUint16s (const mxArray *p); + extern OCTAVE_API mxUint32 * mxGetUint32s (const mxArray *p); + extern OCTAVE_API mxUint64 * mxGetUint64s (const mxArray *p); + + extern OCTAVE_API mxComplexDouble * mxGetComplexDoubles (const mxArray *p); + extern OCTAVE_API mxComplexSingle * mxGetComplexSingles (const mxArray *p); #if 0 /* We don't have these yet. */ - extern OCTINTERP_API mxComplexInt8 * mxGetComplexInt8s (const mxArray *p); - extern OCTINTERP_API mxComplexInt16 * mxGetComplexInt16s (const mxArray *p); - extern OCTINTERP_API mxComplexInt32 * mxGetComplexInt32s (const mxArray *p); - extern OCTINTERP_API mxComplexInt64 * mxGetComplexInt64s (const mxArray *p); - extern OCTINTERP_API mxComplexUint8 * mxGetComplexUint8s (const mxArray *p); - extern OCTINTERP_API mxComplexUint16 * mxGetComplexUint16s (const mxArray *p); - extern OCTINTERP_API mxComplexUint32 * mxGetComplexUint32s (const mxArray *p); - extern OCTINTERP_API mxComplexUint64 * mxGetComplexUint64s (const mxArray *p); + extern OCTAVE_API mxComplexInt8 * mxGetComplexInt8s (const mxArray *p); + extern OCTAVE_API mxComplexInt16 * mxGetComplexInt16s (const mxArray *p); + extern OCTAVE_API mxComplexInt32 * mxGetComplexInt32s (const mxArray *p); + extern OCTAVE_API mxComplexInt64 * mxGetComplexInt64s (const mxArray *p); + extern OCTAVE_API mxComplexUint8 * mxGetComplexUint8s (const mxArray *p); + extern OCTAVE_API mxComplexUint16 * mxGetComplexUint16s (const mxArray *p); + extern OCTAVE_API mxComplexUint32 * mxGetComplexUint32s (const mxArray *p); + extern OCTAVE_API mxComplexUint64 * mxGetComplexUint64s (const mxArray *p); #endif - extern OCTINTERP_API double * mxGetPi (const mxArray *ptr); - extern OCTINTERP_API void * mxGetImagData (const mxArray *ptr); - - extern OCTINTERP_API int mxSetDoubles (mxArray *p, mxDouble *d); - extern OCTINTERP_API int mxSetSingles (mxArray *p, mxSingle *d); - extern OCTINTERP_API int mxSetInt8s (mxArray *p, mxInt8 *d); - extern OCTINTERP_API int mxSetInt16s (mxArray *p, mxInt16 *d); - extern OCTINTERP_API int mxSetInt32s (mxArray *p, mxInt32 *d); - extern OCTINTERP_API int mxSetInt64s (mxArray *p, mxInt64 *d); - extern OCTINTERP_API int mxSetUint8s (mxArray *p, mxUint8 *d); - extern OCTINTERP_API int mxSetUint16s (mxArray *p, mxUint16 *d); - extern OCTINTERP_API int mxSetUint32s (mxArray *p, mxUint32 *d); - extern OCTINTERP_API int mxSetUint64s (mxArray *p, mxUint64 *d); - - extern OCTINTERP_API int mxSetComplexDoubles (mxArray *p, mxComplexDouble *d); - extern OCTINTERP_API int mxSetComplexSingles (mxArray *p, mxComplexSingle *d); + extern OCTAVE_API double * mxGetPi (const mxArray *ptr); + extern OCTAVE_API void * mxGetImagData (const mxArray *ptr); + + extern OCTAVE_API int mxSetDoubles (mxArray *p, mxDouble *d); + extern OCTAVE_API int mxSetSingles (mxArray *p, mxSingle *d); + extern OCTAVE_API int mxSetInt8s (mxArray *p, mxInt8 *d); + extern OCTAVE_API int mxSetInt16s (mxArray *p, mxInt16 *d); + extern OCTAVE_API int mxSetInt32s (mxArray *p, mxInt32 *d); + extern OCTAVE_API int mxSetInt64s (mxArray *p, mxInt64 *d); + extern OCTAVE_API int mxSetUint8s (mxArray *p, mxUint8 *d); + extern OCTAVE_API int mxSetUint16s (mxArray *p, mxUint16 *d); + extern OCTAVE_API int mxSetUint32s (mxArray *p, mxUint32 *d); + extern OCTAVE_API int mxSetUint64s (mxArray *p, mxUint64 *d); + + extern OCTAVE_API int mxSetComplexDoubles (mxArray *p, mxComplexDouble *d); + extern OCTAVE_API int mxSetComplexSingles (mxArray *p, mxComplexSingle *d); #if 0 /* We don't have these yet. */ - extern OCTINTERP_API int mxSetComplexInt8s (mxArray *p, mxComplexInt8 *d); - extern OCTINTERP_API int mxSetComplexInt16s (mxArray *p, mxComplexInt16 *d); - extern OCTINTERP_API int mxSetComplexInt32s (mxArray *p, mxComplexInt32 *d); - extern OCTINTERP_API int mxSetComplexInt64s (mxArray *p, mxComplexInt64 *d); - extern OCTINTERP_API int mxSetComplexUint8s (mxArray *p, mxComplexUint8 *d); - extern OCTINTERP_API int mxSetComplexUint16s (mxArray *p, mxComplexUint16 *d); - extern OCTINTERP_API int mxSetComplexUint32s (mxArray *p, mxComplexUint32 *d); - extern OCTINTERP_API int mxSetComplexUint64s (mxArray *p, mxComplexUint64 *d); + extern OCTAVE_API int mxSetComplexInt8s (mxArray *p, mxComplexInt8 *d); + extern OCTAVE_API int mxSetComplexInt16s (mxArray *p, mxComplexInt16 *d); + extern OCTAVE_API int mxSetComplexInt32s (mxArray *p, mxComplexInt32 *d); + extern OCTAVE_API int mxSetComplexInt64s (mxArray *p, mxComplexInt64 *d); + extern OCTAVE_API int mxSetComplexUint8s (mxArray *p, mxComplexUint8 *d); + extern OCTAVE_API int mxSetComplexUint16s (mxArray *p, mxComplexUint16 *d); + extern OCTAVE_API int mxSetComplexUint32s (mxArray *p, mxComplexUint32 *d); + extern OCTAVE_API int mxSetComplexUint64s (mxArray *p, mxComplexUint64 *d); #endif - extern OCTINTERP_API void mxSetPi (mxArray *ptr, double *pi); - extern OCTINTERP_API void mxSetImagData (mxArray *ptr, void *pi); + extern OCTAVE_API void mxSetPi (mxArray *ptr, double *pi); + extern OCTAVE_API void mxSetImagData (mxArray *ptr, void *pi); } // #define DEBUG 1 diff --git a/libinterp/corefcn/mexproto.h b/libinterp/corefcn/mexproto.h --- a/libinterp/corefcn/mexproto.h +++ b/libinterp/corefcn/mexproto.h @@ -75,73 +75,73 @@ extern void mexFunction (int nlhs, mxArr int nrhs, const mxArray *prhs[]); /* Interface to the interpreter. */ -extern OCTINTERP_API const char * mexFunctionName (void); +extern OCTAVE_API const char * mexFunctionName (void); -extern OCTINTERP_API int mexCallMATLAB (int nargout, mxArray *argout[], +extern OCTAVE_API int mexCallMATLAB (int nargout, mxArray *argout[], int nargin, mxArray *argin[], const char *fname); -extern OCTINTERP_API mxArray * mexCallMATLABWithTrap (int nargout, +extern OCTAVE_API mxArray * mexCallMATLABWithTrap (int nargout, mxArray *argout[], int nargin, mxArray *argin[], const char *fname); -extern OCTINTERP_API int mexEvalString (const char *s); -extern OCTINTERP_API mxArray * mexEvalStringWithTrap (const char *s); +extern OCTAVE_API int mexEvalString (const char *s); +extern OCTAVE_API mxArray * mexEvalStringWithTrap (const char *s); -extern OCTINTERP_API void mexSetTrapFlag (int flag); +extern OCTAVE_API void mexSetTrapFlag (int flag); -extern OCTINTERP_API void mexErrMsgTxt (const char *s); -extern OCTINTERP_API void mexErrMsgIdAndTxt (const char *id, const char *s, +extern OCTAVE_API void mexErrMsgTxt (const char *s); +extern OCTAVE_API void mexErrMsgIdAndTxt (const char *id, const char *s, ...); -extern OCTINTERP_API void mexWarnMsgTxt (const char *s); -extern OCTINTERP_API void mexWarnMsgIdAndTxt (const char *id, const char *s, +extern OCTAVE_API void mexWarnMsgTxt (const char *s); +extern OCTAVE_API void mexWarnMsgIdAndTxt (const char *id, const char *s, ...); -extern OCTINTERP_API int mexPrintf (const char *fmt, ...); +extern OCTAVE_API int mexPrintf (const char *fmt, ...); -extern OCTINTERP_API mxArray * mexGetVariable (const char *space, +extern OCTAVE_API mxArray * mexGetVariable (const char *space, const char *name); -extern OCTINTERP_API const mxArray * mexGetVariablePtr (const char *space, +extern OCTAVE_API const mxArray * mexGetVariablePtr (const char *space, const char *name); -extern OCTINTERP_API int mexPutVariable (const char *space, const char *name, +extern OCTAVE_API int mexPutVariable (const char *space, const char *name, const mxArray *ptr); #if MX_HAS_INTERLEAVED_COMPLEX # define mexGet mexGet_interleaved #endif -extern OCTINTERP_API const mxArray * mexGet (double handle, +extern OCTAVE_API const mxArray * mexGet (double handle, const char *property); -extern OCTINTERP_API int mexSet (double handle, const char *property, +extern OCTAVE_API int mexSet (double handle, const char *property, mxArray *val); -extern OCTINTERP_API void mexMakeArrayPersistent (mxArray *ptr); -extern OCTINTERP_API void mexMakeMemoryPersistent (void *ptr); +extern OCTAVE_API void mexMakeArrayPersistent (mxArray *ptr); +extern OCTAVE_API void mexMakeMemoryPersistent (void *ptr); -extern OCTINTERP_API void mexLock (void); -extern OCTINTERP_API void mexUnlock (void); +extern OCTAVE_API void mexLock (void); +extern OCTAVE_API void mexUnlock (void); -extern OCTINTERP_API int mexIsGlobal (const mxArray *ptr); -extern OCTINTERP_API int mexIsLocked (void); +extern OCTAVE_API int mexIsGlobal (const mxArray *ptr); +extern OCTAVE_API int mexIsLocked (void); -extern OCTINTERP_API int mexAtExit (void (*f) (void)); +extern OCTAVE_API int mexAtExit (void (*f) (void)); /* Floating point predicates. */ -extern OCTINTERP_API bool mxIsFinite (double v); -extern OCTINTERP_API bool mxIsInf (double v); -extern OCTINTERP_API bool mxIsNaN (double v); +extern OCTAVE_API bool mxIsFinite (double v); +extern OCTAVE_API bool mxIsInf (double v); +extern OCTAVE_API bool mxIsNaN (double v); /* Floating point values. */ -extern OCTINTERP_API double mxGetEps (void); -extern OCTINTERP_API double mxGetInf (void); -extern OCTINTERP_API double mxGetNaN (void); +extern OCTAVE_API double mxGetEps (void); +extern OCTAVE_API double mxGetInf (void); +extern OCTAVE_API double mxGetNaN (void); /* Memory management. */ -extern OCTINTERP_API void * mxCalloc (size_t n, size_t size); -extern OCTINTERP_API void * mxMalloc (size_t n); -extern OCTINTERP_API void * mxRealloc (void *ptr, size_t size); -extern OCTINTERP_API void mxFree (void *ptr); +extern OCTAVE_API void * mxCalloc (size_t n, size_t size); +extern OCTAVE_API void * mxMalloc (size_t n); +extern OCTAVE_API void * mxRealloc (void *ptr, size_t size); +extern OCTAVE_API void mxFree (void *ptr); /* Constructors. */ #if MX_HAS_INTERLEAVED_COMPLEX @@ -165,231 +165,231 @@ extern OCTINTERP_API void mxFree (void * # define mxCreateStructMatrix mxCreateStructMatrix_interleaved #endif -extern OCTINTERP_API mxArray * mxCreateCellArray (mwSize ndims, +extern OCTAVE_API mxArray * mxCreateCellArray (mwSize ndims, const mwSize *dims); -extern OCTINTERP_API mxArray * mxCreateCellMatrix (mwSize m, mwSize n); -extern OCTINTERP_API mxArray * mxCreateCharArray (mwSize ndims, +extern OCTAVE_API mxArray * mxCreateCellMatrix (mwSize m, mwSize n); +extern OCTAVE_API mxArray * mxCreateCharArray (mwSize ndims, const mwSize *dims); -extern OCTINTERP_API mxArray * mxCreateCharMatrixFromStrings (mwSize m, +extern OCTAVE_API mxArray * mxCreateCharMatrixFromStrings (mwSize m, const char **str); -extern OCTINTERP_API mxArray * mxCreateDoubleMatrix (mwSize nr, mwSize nc, +extern OCTAVE_API mxArray * mxCreateDoubleMatrix (mwSize nr, mwSize nc, mxComplexity flag); -extern OCTINTERP_API mxArray * mxCreateDoubleScalar (double val); -extern OCTINTERP_API mxArray * mxCreateLogicalArray (mwSize ndims, +extern OCTAVE_API mxArray * mxCreateDoubleScalar (double val); +extern OCTAVE_API mxArray * mxCreateLogicalArray (mwSize ndims, const mwSize *dims); -extern OCTINTERP_API mxArray * mxCreateLogicalMatrix (mwSize m, mwSize n); -extern OCTINTERP_API mxArray * mxCreateLogicalScalar (mxLogical val); -extern OCTINTERP_API mxArray * mxCreateNumericArray (mwSize ndims, +extern OCTAVE_API mxArray * mxCreateLogicalMatrix (mwSize m, mwSize n); +extern OCTAVE_API mxArray * mxCreateLogicalScalar (mxLogical val); +extern OCTAVE_API mxArray * mxCreateNumericArray (mwSize ndims, const mwSize *dims, mxClassID class_id, mxComplexity flag); -extern OCTINTERP_API mxArray * mxCreateNumericMatrix (mwSize m, mwSize n, +extern OCTAVE_API mxArray * mxCreateNumericMatrix (mwSize m, mwSize n, mxClassID class_id, mxComplexity flag); -extern OCTINTERP_API mxArray * mxCreateUninitNumericArray (mwSize ndims, +extern OCTAVE_API mxArray * mxCreateUninitNumericArray (mwSize ndims, const mwSize *dims, mxClassID class_id, mxComplexity flag); -extern OCTINTERP_API mxArray * mxCreateUninitNumericMatrix (mwSize m, mwSize n, +extern OCTAVE_API mxArray * mxCreateUninitNumericMatrix (mwSize m, mwSize n, mxClassID class_id, mxComplexity flag); -extern OCTINTERP_API mxArray * mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, +extern OCTAVE_API mxArray * mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, mxComplexity flag); -extern OCTINTERP_API mxArray * mxCreateSparseLogicalMatrix (mwSize m, mwSize n, +extern OCTAVE_API mxArray * mxCreateSparseLogicalMatrix (mwSize m, mwSize n, mwSize nzmax); -extern OCTINTERP_API mxArray * mxCreateString (const char *str); -extern OCTINTERP_API mxArray * mxCreateStructArray (mwSize ndims, +extern OCTAVE_API mxArray * mxCreateString (const char *str); +extern OCTAVE_API mxArray * mxCreateStructArray (mwSize ndims, const mwSize *dims, int num_keys, const char **keys); -extern OCTINTERP_API mxArray * mxCreateStructMatrix (mwSize rows, mwSize cols, +extern OCTAVE_API mxArray * mxCreateStructMatrix (mwSize rows, mwSize cols, int num_keys, const char **keys); /* Copy constructor. */ -extern OCTINTERP_API mxArray * mxDuplicateArray (const mxArray *v); +extern OCTAVE_API mxArray * mxDuplicateArray (const mxArray *v); /* Destructor. */ -extern OCTINTERP_API void mxDestroyArray (mxArray *v); +extern OCTAVE_API void mxDestroyArray (mxArray *v); /* Type Predicates. */ -extern OCTINTERP_API bool mxIsCell (const mxArray *ptr); -extern OCTINTERP_API bool mxIsChar (const mxArray *ptr); -extern OCTINTERP_API bool mxIsClass (const mxArray *ptr, const char *name); -extern OCTINTERP_API bool mxIsComplex (const mxArray *ptr); -extern OCTINTERP_API bool mxIsDouble (const mxArray *ptr); +extern OCTAVE_API bool mxIsCell (const mxArray *ptr); +extern OCTAVE_API bool mxIsChar (const mxArray *ptr); +extern OCTAVE_API bool mxIsClass (const mxArray *ptr, const char *name); +extern OCTAVE_API bool mxIsComplex (const mxArray *ptr); +extern OCTAVE_API bool mxIsDouble (const mxArray *ptr); /* Matlab seems to have deprecated IsFunctionHandle, but it seems useful */ -extern OCTINTERP_API bool mxIsFunctionHandle (const mxArray *ptr); -extern OCTINTERP_API bool mxIsInt16 (const mxArray *ptr); -extern OCTINTERP_API bool mxIsInt32 (const mxArray *ptr); -extern OCTINTERP_API bool mxIsInt64 (const mxArray *ptr); -extern OCTINTERP_API bool mxIsInt8 (const mxArray *ptr); -extern OCTINTERP_API bool mxIsLogical (const mxArray *ptr); -extern OCTINTERP_API bool mxIsNumeric (const mxArray *ptr); -extern OCTINTERP_API bool mxIsSingle (const mxArray *ptr); -extern OCTINTERP_API bool mxIsSparse (const mxArray *ptr); -extern OCTINTERP_API bool mxIsStruct (const mxArray *ptr); -extern OCTINTERP_API bool mxIsUint16 (const mxArray *ptr); -extern OCTINTERP_API bool mxIsUint32 (const mxArray *ptr); -extern OCTINTERP_API bool mxIsUint64 (const mxArray *ptr); -extern OCTINTERP_API bool mxIsUint8 (const mxArray *ptr); +extern OCTAVE_API bool mxIsFunctionHandle (const mxArray *ptr); +extern OCTAVE_API bool mxIsInt16 (const mxArray *ptr); +extern OCTAVE_API bool mxIsInt32 (const mxArray *ptr); +extern OCTAVE_API bool mxIsInt64 (const mxArray *ptr); +extern OCTAVE_API bool mxIsInt8 (const mxArray *ptr); +extern OCTAVE_API bool mxIsLogical (const mxArray *ptr); +extern OCTAVE_API bool mxIsNumeric (const mxArray *ptr); +extern OCTAVE_API bool mxIsSingle (const mxArray *ptr); +extern OCTAVE_API bool mxIsSparse (const mxArray *ptr); +extern OCTAVE_API bool mxIsStruct (const mxArray *ptr); +extern OCTAVE_API bool mxIsUint16 (const mxArray *ptr); +extern OCTAVE_API bool mxIsUint32 (const mxArray *ptr); +extern OCTAVE_API bool mxIsUint64 (const mxArray *ptr); +extern OCTAVE_API bool mxIsUint8 (const mxArray *ptr); /* Odd type+size predicate. */ -extern OCTINTERP_API bool mxIsLogicalScalar (const mxArray *ptr); +extern OCTAVE_API bool mxIsLogicalScalar (const mxArray *ptr); /* Odd type+size+value predicate. */ -extern OCTINTERP_API bool mxIsLogicalScalarTrue (const mxArray *ptr); +extern OCTAVE_API bool mxIsLogicalScalarTrue (const mxArray *ptr); /* Size predicates. */ -extern OCTINTERP_API bool mxIsEmpty (const mxArray *ptr); -extern OCTINTERP_API bool mxIsScalar (const mxArray *ptr); +extern OCTAVE_API bool mxIsEmpty (const mxArray *ptr); +extern OCTAVE_API bool mxIsScalar (const mxArray *ptr); /* Just plain odd thing to ask of a value. */ -extern OCTINTERP_API bool mxIsFromGlobalWS (const mxArray *ptr); +extern OCTAVE_API bool mxIsFromGlobalWS (const mxArray *ptr); /* Dimension extractors. */ -extern OCTINTERP_API size_t mxGetM (const mxArray *ptr); -extern OCTINTERP_API size_t mxGetN (const mxArray *ptr); -extern OCTINTERP_API const mwSize * mxGetDimensions (const mxArray *ptr); -extern OCTINTERP_API mwSize mxGetNumberOfDimensions (const mxArray *ptr); -extern OCTINTERP_API size_t mxGetNumberOfElements (const mxArray *ptr); +extern OCTAVE_API size_t mxGetM (const mxArray *ptr); +extern OCTAVE_API size_t mxGetN (const mxArray *ptr); +extern OCTAVE_API const mwSize * mxGetDimensions (const mxArray *ptr); +extern OCTAVE_API mwSize mxGetNumberOfDimensions (const mxArray *ptr); +extern OCTAVE_API size_t mxGetNumberOfElements (const mxArray *ptr); /* Dimension setters. */ -extern OCTINTERP_API void mxSetM (mxArray *ptr, mwSize M); -extern OCTINTERP_API void mxSetN (mxArray *ptr, mwSize N); -extern OCTINTERP_API int mxSetDimensions (mxArray *ptr, const mwSize *dims, +extern OCTAVE_API void mxSetM (mxArray *ptr, mwSize M); +extern OCTAVE_API void mxSetN (mxArray *ptr, mwSize N); +extern OCTAVE_API int mxSetDimensions (mxArray *ptr, const mwSize *dims, mwSize ndims); #if MX_HAS_INTERLEAVED_COMPLEX -extern OCTINTERP_API int mxMakeArrayReal (mxArray *ptr); -extern OCTINTERP_API int mxMakeArrayComplex (mxArray *ptr); +extern OCTAVE_API int mxMakeArrayReal (mxArray *ptr); +extern OCTAVE_API int mxMakeArrayComplex (mxArray *ptr); #endif /* Data extractors. */ -extern OCTINTERP_API double * mxGetPr (const mxArray *ptr); -extern OCTINTERP_API double mxGetScalar (const mxArray *ptr); -extern OCTINTERP_API mxChar * mxGetChars (const mxArray *ptr); -extern OCTINTERP_API mxLogical * mxGetLogicals (const mxArray *ptr); -extern OCTINTERP_API void * mxGetData (const mxArray *ptr); +extern OCTAVE_API double * mxGetPr (const mxArray *ptr); +extern OCTAVE_API double mxGetScalar (const mxArray *ptr); +extern OCTAVE_API mxChar * mxGetChars (const mxArray *ptr); +extern OCTAVE_API mxLogical * mxGetLogicals (const mxArray *ptr); +extern OCTAVE_API void * mxGetData (const mxArray *ptr); #if MX_HAS_INTERLEAVED_COMPLEX -extern OCTINTERP_API mxDouble * mxGetDoubles (const mxArray *p); -extern OCTINTERP_API mxSingle * mxGetSingles (const mxArray *p); -extern OCTINTERP_API mxInt8 * mxGetInt8s (const mxArray *p); -extern OCTINTERP_API mxInt16 * mxGetInt16s (const mxArray *p); -extern OCTINTERP_API mxInt32 * mxGetInt32s (const mxArray *p); -extern OCTINTERP_API mxInt64 * mxGetInt64s (const mxArray *p); -extern OCTINTERP_API mxUint8 * mxGetUint8s (const mxArray *p); -extern OCTINTERP_API mxUint16 * mxGetUint16s (const mxArray *p); -extern OCTINTERP_API mxUint32 * mxGetUint32s (const mxArray *p); -extern OCTINTERP_API mxUint64 * mxGetUint64s (const mxArray *p); +extern OCTAVE_API mxDouble * mxGetDoubles (const mxArray *p); +extern OCTAVE_API mxSingle * mxGetSingles (const mxArray *p); +extern OCTAVE_API mxInt8 * mxGetInt8s (const mxArray *p); +extern OCTAVE_API mxInt16 * mxGetInt16s (const mxArray *p); +extern OCTAVE_API mxInt32 * mxGetInt32s (const mxArray *p); +extern OCTAVE_API mxInt64 * mxGetInt64s (const mxArray *p); +extern OCTAVE_API mxUint8 * mxGetUint8s (const mxArray *p); +extern OCTAVE_API mxUint16 * mxGetUint16s (const mxArray *p); +extern OCTAVE_API mxUint32 * mxGetUint32s (const mxArray *p); +extern OCTAVE_API mxUint64 * mxGetUint64s (const mxArray *p); -extern OCTINTERP_API mxComplexDouble * mxGetComplexDoubles (const mxArray *p); -extern OCTINTERP_API mxComplexSingle * mxGetComplexSingles (const mxArray *p); +extern OCTAVE_API mxComplexDouble * mxGetComplexDoubles (const mxArray *p); +extern OCTAVE_API mxComplexSingle * mxGetComplexSingles (const mxArray *p); #if 0 /* We don't have these yet. */ -extern OCTINTERP_API mxComplexInt8 * mxGetComplexInt8s (const mxArray *p); -extern OCTINTERP_API mxComplexInt16 * mxGetComplexInt16s (const mxArray *p); -extern OCTINTERP_API mxComplexInt32 * mxGetComplexInt32s (const mxArray *p); -extern OCTINTERP_API mxComplexInt64 * mxGetComplexInt64s (const mxArray *p); -extern OCTINTERP_API mxComplexUint8 * mxGetComplexUint8s (const mxArray *p); -extern OCTINTERP_API mxComplexUint16 * mxGetComplexUint16s (const mxArray *p); -extern OCTINTERP_API mxComplexUint32 * mxGetComplexUint32s (const mxArray *p); -extern OCTINTERP_API mxComplexUint64 * mxGetComplexUint64s (const mxArray *p); +extern OCTAVE_API mxComplexInt8 * mxGetComplexInt8s (const mxArray *p); +extern OCTAVE_API mxComplexInt16 * mxGetComplexInt16s (const mxArray *p); +extern OCTAVE_API mxComplexInt32 * mxGetComplexInt32s (const mxArray *p); +extern OCTAVE_API mxComplexInt64 * mxGetComplexInt64s (const mxArray *p); +extern OCTAVE_API mxComplexUint8 * mxGetComplexUint8s (const mxArray *p); +extern OCTAVE_API mxComplexUint16 * mxGetComplexUint16s (const mxArray *p); +extern OCTAVE_API mxComplexUint32 * mxGetComplexUint32s (const mxArray *p); +extern OCTAVE_API mxComplexUint64 * mxGetComplexUint64s (const mxArray *p); #endif #else -extern OCTINTERP_API double * mxGetPi (const mxArray *ptr); -extern OCTINTERP_API void * mxGetImagData (const mxArray *ptr); +extern OCTAVE_API double * mxGetPi (const mxArray *ptr); +extern OCTAVE_API void * mxGetImagData (const mxArray *ptr); #endif /* Data setters. */ -extern OCTINTERP_API void mxSetPr (mxArray *ptr, double *pr); -extern OCTINTERP_API void mxSetData (mxArray *ptr, void *data); +extern OCTAVE_API void mxSetPr (mxArray *ptr, double *pr); +extern OCTAVE_API void mxSetData (mxArray *ptr, void *data); #if MX_HAS_INTERLEAVED_COMPLEX -extern OCTINTERP_API int mxSetDoubles (mxArray *p, mxDouble *d); -extern OCTINTERP_API int mxSetSingles (mxArray *p, mxSingle *d); -extern OCTINTERP_API int mxSetInt8s (mxArray *p, mxInt8 *d); -extern OCTINTERP_API int mxSetInt16s (mxArray *p, mxInt16 *d); -extern OCTINTERP_API int mxSetInt32s (mxArray *p, mxInt32 *d); -extern OCTINTERP_API int mxSetInt64s (mxArray *p, mxInt64 *d); -extern OCTINTERP_API int mxSetUint8s (mxArray *p, mxUint8 *d); -extern OCTINTERP_API int mxSetUint16s (mxArray *p, mxUint16 *d); -extern OCTINTERP_API int mxSetUint32s (mxArray *p, mxUint32 *d); -extern OCTINTERP_API int mxSetUint64s (mxArray *p, mxUint64 *d); +extern OCTAVE_API int mxSetDoubles (mxArray *p, mxDouble *d); +extern OCTAVE_API int mxSetSingles (mxArray *p, mxSingle *d); +extern OCTAVE_API int mxSetInt8s (mxArray *p, mxInt8 *d); +extern OCTAVE_API int mxSetInt16s (mxArray *p, mxInt16 *d); +extern OCTAVE_API int mxSetInt32s (mxArray *p, mxInt32 *d); +extern OCTAVE_API int mxSetInt64s (mxArray *p, mxInt64 *d); +extern OCTAVE_API int mxSetUint8s (mxArray *p, mxUint8 *d); +extern OCTAVE_API int mxSetUint16s (mxArray *p, mxUint16 *d); +extern OCTAVE_API int mxSetUint32s (mxArray *p, mxUint32 *d); +extern OCTAVE_API int mxSetUint64s (mxArray *p, mxUint64 *d); -extern OCTINTERP_API int mxSetComplexDoubles (mxArray *p, mxComplexDouble *d); -extern OCTINTERP_API int mxSetComplexSingles (mxArray *p, mxComplexSingle *d); +extern OCTAVE_API int mxSetComplexDoubles (mxArray *p, mxComplexDouble *d); +extern OCTAVE_API int mxSetComplexSingles (mxArray *p, mxComplexSingle *d); #if 0 /* We don't have these yet. */ -extern OCTINTERP_API int mxSetComplexInt8s (mxArray *p, mxComplexInt8 *d); -extern OCTINTERP_API int mxSetComplexInt16s (mxArray *p, mxComplexInt16 *d); -extern OCTINTERP_API int mxSetComplexInt32s (mxArray *p, mxComplexInt32 *d); -extern OCTINTERP_API int mxSetComplexInt64s (mxArray *p, mxComplexInt64 *d); -extern OCTINTERP_API int mxSetComplexUint8s (mxArray *p, mxComplexUint8 *d); -extern OCTINTERP_API int mxSetComplexUint16s (mxArray *p, mxComplexUint16 *d); -extern OCTINTERP_API int mxSetComplexUint32s (mxArray *p, mxComplexUint32 *d); -extern OCTINTERP_API int mxSetComplexUint64s (mxArray *p, mxComplexUint64 *d); +extern OCTAVE_API int mxSetComplexInt8s (mxArray *p, mxComplexInt8 *d); +extern OCTAVE_API int mxSetComplexInt16s (mxArray *p, mxComplexInt16 *d); +extern OCTAVE_API int mxSetComplexInt32s (mxArray *p, mxComplexInt32 *d); +extern OCTAVE_API int mxSetComplexInt64s (mxArray *p, mxComplexInt64 *d); +extern OCTAVE_API int mxSetComplexUint8s (mxArray *p, mxComplexUint8 *d); +extern OCTAVE_API int mxSetComplexUint16s (mxArray *p, mxComplexUint16 *d); +extern OCTAVE_API int mxSetComplexUint32s (mxArray *p, mxComplexUint32 *d); +extern OCTAVE_API int mxSetComplexUint64s (mxArray *p, mxComplexUint64 *d); #endif #else -extern OCTINTERP_API void mxSetPi (mxArray *ptr, double *pi); -extern OCTINTERP_API void mxSetImagData (mxArray *ptr, void *pi); +extern OCTAVE_API void mxSetPi (mxArray *ptr, double *pi); +extern OCTAVE_API void mxSetImagData (mxArray *ptr, void *pi); #endif /* Classes. */ -extern OCTINTERP_API mxClassID mxGetClassID (const mxArray *ptr); -extern OCTINTERP_API const char * mxGetClassName (const mxArray *ptr); -extern OCTINTERP_API void mxSetClassName (mxArray *ptr, const char *name); -extern OCTINTERP_API mxArray * mxGetProperty (const mxArray *ptr, mwIndex idx, +extern OCTAVE_API mxClassID mxGetClassID (const mxArray *ptr); +extern OCTAVE_API const char * mxGetClassName (const mxArray *ptr); +extern OCTAVE_API void mxSetClassName (mxArray *ptr, const char *name); +extern OCTAVE_API mxArray * mxGetProperty (const mxArray *ptr, mwIndex idx, const char *property_name); -extern OCTINTERP_API void mxSetProperty (mxArray *ptr, mwIndex idx, +extern OCTAVE_API void mxSetProperty (mxArray *ptr, mwIndex idx, const char *property_name, const mxArray *property_value); /* Cell support. */ -extern OCTINTERP_API mxArray * mxGetCell (const mxArray *ptr, mwIndex idx); +extern OCTAVE_API mxArray * mxGetCell (const mxArray *ptr, mwIndex idx); -extern OCTINTERP_API void mxSetCell (mxArray *ptr, mwIndex idx, mxArray *val); +extern OCTAVE_API void mxSetCell (mxArray *ptr, mwIndex idx, mxArray *val); /* Sparse support. */ -extern OCTINTERP_API mwIndex * mxGetIr (const mxArray *ptr); -extern OCTINTERP_API mwIndex * mxGetJc (const mxArray *ptr); -extern OCTINTERP_API mwSize mxGetNzmax (const mxArray *ptr); +extern OCTAVE_API mwIndex * mxGetIr (const mxArray *ptr); +extern OCTAVE_API mwIndex * mxGetJc (const mxArray *ptr); +extern OCTAVE_API mwSize mxGetNzmax (const mxArray *ptr); -extern OCTINTERP_API void mxSetIr (mxArray *ptr, mwIndex *ir); -extern OCTINTERP_API void mxSetJc (mxArray *ptr, mwIndex *jc); -extern OCTINTERP_API void mxSetNzmax (mxArray *ptr, mwSize nzmax); +extern OCTAVE_API void mxSetIr (mxArray *ptr, mwIndex *ir); +extern OCTAVE_API void mxSetJc (mxArray *ptr, mwIndex *jc); +extern OCTAVE_API void mxSetNzmax (mxArray *ptr, mwSize nzmax); /* Structure support. */ -extern OCTINTERP_API int mxAddField (mxArray *ptr, const char *key); +extern OCTAVE_API int mxAddField (mxArray *ptr, const char *key); -extern OCTINTERP_API void mxRemoveField (mxArray *ptr, int key_num); +extern OCTAVE_API void mxRemoveField (mxArray *ptr, int key_num); -extern OCTINTERP_API mxArray * mxGetField (const mxArray *ptr, mwIndex index, +extern OCTAVE_API mxArray * mxGetField (const mxArray *ptr, mwIndex index, const char *key); -extern OCTINTERP_API mxArray * mxGetFieldByNumber (const mxArray *ptr, +extern OCTAVE_API mxArray * mxGetFieldByNumber (const mxArray *ptr, mwIndex index, int key_num); -extern OCTINTERP_API void mxSetField (mxArray *ptr, mwIndex index, +extern OCTAVE_API void mxSetField (mxArray *ptr, mwIndex index, const char *key, mxArray *val); -extern OCTINTERP_API void mxSetFieldByNumber (mxArray *ptr, mwIndex index, +extern OCTAVE_API void mxSetFieldByNumber (mxArray *ptr, mwIndex index, int key_num, mxArray *val); -extern OCTINTERP_API int mxGetNumberOfFields (const mxArray *ptr); +extern OCTAVE_API int mxGetNumberOfFields (const mxArray *ptr); -extern OCTINTERP_API const char * mxGetFieldNameByNumber (const mxArray *ptr, +extern OCTAVE_API const char * mxGetFieldNameByNumber (const mxArray *ptr, int key_num); -extern OCTINTERP_API int mxGetFieldNumber (const mxArray *ptr, const char *key); +extern OCTAVE_API int mxGetFieldNumber (const mxArray *ptr, const char *key); -extern OCTINTERP_API int mxGetString (const mxArray *ptr, char *buf, +extern OCTAVE_API int mxGetString (const mxArray *ptr, char *buf, mwSize buflen); -extern OCTINTERP_API char * mxArrayToString (const mxArray *ptr); +extern OCTAVE_API char * mxArrayToString (const mxArray *ptr); /* Miscellaneous. */ -extern OCTINTERP_API mwIndex mxCalcSingleSubscript (const mxArray *ptr, +extern OCTAVE_API mwIndex mxCalcSingleSubscript (const mxArray *ptr, mwSize nsubs, mwIndex *subs); -extern OCTINTERP_API size_t mxGetElementSize (const mxArray *ptr); +extern OCTAVE_API size_t mxGetElementSize (const mxArray *ptr); #if defined (MEX_DEBUG) diff --git a/libinterp/corefcn/oct-hist.h b/libinterp/corefcn/oct-hist.h --- a/libinterp/corefcn/oct-hist.h +++ b/libinterp/corefcn/oct-hist.h @@ -39,7 +39,7 @@ namespace octave class interpreter; class - OCTINTERP_API + OCTAVE_API history_system { public: diff --git a/libinterp/corefcn/oct-map.h b/libinterp/corefcn/oct-map.h --- a/libinterp/corefcn/oct-map.h +++ b/libinterp/corefcn/oct-map.h @@ -39,7 +39,7 @@ class string_vector; // A class holding a map field->index. Supports reference-counting. -class OCTINTERP_API +class OCTAVE_API octave_fields { class fields_rep : public std::map @@ -157,7 +157,7 @@ public: } }; -class OCTINTERP_API +class OCTAVE_API octave_scalar_map { public: @@ -272,7 +272,7 @@ inline octave_scalar_map octave_value_extract (const octave_value& v) { return v.scalar_map_value (); } -class OCTINTERP_API +class OCTAVE_API octave_map { public: diff --git a/libinterp/corefcn/oct-process.cc b/libinterp/corefcn/oct-process.cc --- a/libinterp/corefcn/oct-process.cc +++ b/libinterp/corefcn/oct-process.cc @@ -33,7 +33,7 @@ namespace octave { - OCTINTERP_API + OCTAVE_API process_execution_result process_execution_result::of_success (int exit_status, const std::string& stdout_output) @@ -41,7 +41,7 @@ namespace octave return process_execution_result (0, exit_status, stdout_output, ""); } - OCTINTERP_API + OCTAVE_API process_execution_result process_execution_result::of_error (int status, const std::string& err_msg) { @@ -49,7 +49,7 @@ namespace octave } // Execute a shell command, returning results as a C++ object - OCTINTERP_API + OCTAVE_API process_execution_result run_command_and_return_output (const std::string& cmd_str) { diff --git a/libinterp/corefcn/oct-process.h b/libinterp/corefcn/oct-process.h --- a/libinterp/corefcn/oct-process.h +++ b/libinterp/corefcn/oct-process.h @@ -33,7 +33,7 @@ namespace octave { class - OCTINTERP_API + OCTAVE_API process_execution_result { public: @@ -78,7 +78,7 @@ namespace octave std::string m_stdout_output; }; - extern OCTINTERP_API process_execution_result + extern OCTAVE_API process_execution_result run_command_and_return_output (const std::string& cmd_str); } diff --git a/libinterp/corefcn/oct-stream.cc b/libinterp/corefcn/oct-stream.cc --- a/libinterp/corefcn/oct-stream.cc +++ b/libinterp/corefcn/oct-stream.cc @@ -1783,7 +1783,7 @@ namespace octave // scanner.scan (...); class - OCTINTERP_API + OCTAVE_API textscan { public: diff --git a/libinterp/corefcn/oct-stream.h b/libinterp/corefcn/oct-stream.h --- a/libinterp/corefcn/oct-stream.h +++ b/libinterp/corefcn/oct-stream.h @@ -62,7 +62,7 @@ namespace octave // Provide an interface for Octave streams. class - OCTINTERP_API + OCTAVE_API base_stream { friend class stream; @@ -249,7 +249,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API stream { public: @@ -426,7 +426,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API stream_list { public: diff --git a/libinterp/corefcn/pager.h b/libinterp/corefcn/pager.h --- a/libinterp/corefcn/pager.h +++ b/libinterp/corefcn/pager.h @@ -42,7 +42,7 @@ namespace octave class interpreter; class - OCTINTERP_API + OCTAVE_API pager_buf : public std::stringbuf { public: @@ -63,7 +63,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API pager_stream : public std::ostream { public: @@ -92,7 +92,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API diary_buf : public std::stringbuf { public: @@ -105,7 +105,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API diary_stream : public std::ostream { public: @@ -129,7 +129,7 @@ namespace octave diary_buf *db; }; - extern OCTINTERP_API void flush_stdout (void); + extern OCTAVE_API void flush_stdout (void); class output_system { @@ -305,9 +305,9 @@ namespace octave void do_sync (const char *msg, int len, bool bypass_pager); }; - extern OCTINTERP_API std::ostream& __stdout__ (void); + extern OCTAVE_API std::ostream& __stdout__ (void); - extern OCTINTERP_API std::ostream& __diary__ (void); + extern OCTAVE_API std::ostream& __diary__ (void); } #define octave_stdout (octave::__stdout__ ()) diff --git a/libinterp/corefcn/pr-flt-fmt.h b/libinterp/corefcn/pr-flt-fmt.h --- a/libinterp/corefcn/pr-flt-fmt.h +++ b/libinterp/corefcn/pr-flt-fmt.h @@ -40,12 +40,12 @@ class pr_formatted_float; template class pr_rational_float; -extern OCTINTERP_API int output_precision (void); +extern OCTAVE_API int output_precision (void); -extern OCTINTERP_API void set_output_prec (int prec); +extern OCTAVE_API void set_output_prec (int prec); class -OCTINTERP_API +OCTAVE_API float_format { public: @@ -206,7 +206,7 @@ private: }; class -OCTINTERP_API +OCTAVE_API float_display_format { public: diff --git a/libinterp/corefcn/pr-output.cc b/libinterp/corefcn/pr-output.cc --- a/libinterp/corefcn/pr-output.cc +++ b/libinterp/corefcn/pr-output.cc @@ -2917,7 +2917,7 @@ octave_print_internal_template (std::ost } #define PRINT_INT_SCALAR_INTERNAL(TYPE) \ - OCTINTERP_API void \ + OCTAVE_API void \ octave_print_internal (std::ostream& os, \ const float_display_format& fmt, \ const octave_int& val, bool dummy) \ @@ -3166,7 +3166,7 @@ octave_print_internal_template (std::ost } #define PRINT_INT_ARRAY_INTERNAL(TYPE) \ - OCTINTERP_API void \ + OCTAVE_API void \ octave_print_internal (std::ostream& os, const intNDArray& nda, \ bool pr_as_read_syntax, int extra_indent) \ { \ diff --git a/libinterp/corefcn/pr-output.h b/libinterp/corefcn/pr-output.h --- a/libinterp/corefcn/pr-output.h +++ b/libinterp/corefcn/pr-output.h @@ -183,15 +183,15 @@ make_format (const octave_uint64& nda); // FIXME: templates plus specializations might help here. -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const float_display_format& fmt, bool d, bool pr_as_read_syntax = false); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, bool d, bool pr_as_read_syntax = false); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const float_display_format& fmt, char c, bool pr_as_read_syntax = false); @@ -203,7 +203,7 @@ octave_print_internal (std::ostream& os, octave_print_internal (os, fmt, c, pr_as_read_syntax); } -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const float_display_format& fmt, double d, bool pr_as_read_syntax = false); @@ -214,7 +214,7 @@ octave_print_internal (std::ostream& os, octave_print_internal (os, make_format (d), d, pr_as_read_syntax); } -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const float_display_format& fmt, float d, bool pr_as_read_syntax = false); @@ -225,37 +225,37 @@ octave_print_internal (std::ostream& os, octave_print_internal (os, make_format (d), d, pr_as_read_syntax); } -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const Matrix& m, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const FloatMatrix& m, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const DiagMatrix& m, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const FloatDiagMatrix& m, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const NDArray& nda, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const FloatNDArray& nda, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const float_display_format& fmt, const Complex& c, bool pr_as_read_syntax = false); @@ -266,7 +266,7 @@ octave_print_internal (std::ostream& os, octave_print_internal (os, make_format (c), c, pr_as_read_syntax); } -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const float_display_format& fmt, const FloatComplex& c, bool pr_as_read_syntax = false); @@ -277,114 +277,114 @@ octave_print_internal (std::ostream& os, octave_print_internal (os, make_format (c), c, pr_as_read_syntax); } -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const ComplexMatrix& cm, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const ComplexDiagMatrix& cm, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const FloatComplexMatrix& cm, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const FloatComplexDiagMatrix& cm, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const ComplexNDArray& nda, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const FloatComplexNDArray& nda, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const PermMatrix& m, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const octave::range& r, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const boolMatrix& m, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const boolNDArray& m, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const charMatrix& chm, bool pr_as_read_syntax = false, int extra_indent = 0, bool pr_as_string = false); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const charNDArray& nda, bool pr_as_read_syntax = false, int extra_indent = 0, bool pr_as_string = false); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const std::string& s, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const Array& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const intNDArray& sa, bool pr_as_read_syntax = false, int extra_indent = 0); @@ -394,7 +394,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -407,7 +407,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -420,7 +420,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -433,7 +433,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -446,7 +446,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -459,7 +459,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -472,7 +472,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -485,7 +485,7 @@ octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false); -inline OCTINTERP_API void +inline OCTAVE_API void octave_print_internal (std::ostream& os, const octave_int& sa, bool pr_as_read_syntax = false) { @@ -493,7 +493,7 @@ octave_print_internal (std::ostream& os, octave_print_internal (os, fmt, sa, pr_as_read_syntax); } -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const Cell& cell, bool pr_as_read_syntax = false, int extra_indent = 0, @@ -508,7 +508,7 @@ octave_print_internal (std::ostream& os, pr_as_string); } -extern OCTINTERP_API void +extern OCTAVE_API void octave_print_internal (std::ostream& os, const octave_value& ov, bool pr_as_read_syntax = false); diff --git a/libinterp/corefcn/procstream.h b/libinterp/corefcn/procstream.h --- a/libinterp/corefcn/procstream.h +++ b/libinterp/corefcn/procstream.h @@ -36,7 +36,7 @@ #include "oct-procbuf.h" class -OCTINTERP_API +OCTAVE_API procstreambase : virtual public std::ios { public: @@ -81,7 +81,7 @@ private: }; class -OCTINTERP_API +OCTAVE_API iprocstream : public std::istream, public procstreambase { public: @@ -116,7 +116,7 @@ private: }; class -OCTINTERP_API +OCTAVE_API oprocstream : public std::ostream, public procstreambase { public: @@ -149,7 +149,7 @@ private: }; class -OCTINTERP_API +OCTAVE_API procstream : public std::iostream, public procstreambase { public: diff --git a/libinterp/corefcn/sighandlers.h b/libinterp/corefcn/sighandlers.h --- a/libinterp/corefcn/sighandlers.h +++ b/libinterp/corefcn/sighandlers.h @@ -56,30 +56,30 @@ namespace octave extern int pipe_handler_error_count; // TRUE means we can be interrupted. - extern OCTINTERP_API bool can_interrupt; + extern OCTAVE_API bool can_interrupt; - extern OCTINTERP_API sig_handler * + extern OCTAVE_API sig_handler * set_signal_handler (int sig, sig_handler *h, bool restart_syscalls = true); - extern OCTINTERP_API sig_handler * + extern OCTAVE_API sig_handler * set_signal_handler (const char *signame, sig_handler *h, bool restart_syscalls = true); - extern OCTINTERP_API void install_signal_handlers (void); + extern OCTAVE_API void install_signal_handlers (void); - extern OCTINTERP_API void respond_to_pending_signals (void); + extern OCTAVE_API void respond_to_pending_signals (void); - extern OCTINTERP_API interrupt_handler catch_interrupts (void); + extern OCTAVE_API interrupt_handler catch_interrupts (void); - extern OCTINTERP_API interrupt_handler ignore_interrupts (void); + extern OCTAVE_API interrupt_handler ignore_interrupts (void); - extern OCTINTERP_API interrupt_handler + extern OCTAVE_API interrupt_handler set_interrupt_handler (const volatile interrupt_handler& h, bool restart_syscalls = true); // TRUE means we should try to enter the debugger on SIGINT. - extern OCTINTERP_API bool Vdebug_on_interrupt; + extern OCTAVE_API bool Vdebug_on_interrupt; } #endif diff --git a/libinterp/corefcn/syminfo.h b/libinterp/corefcn/syminfo.h --- a/libinterp/corefcn/syminfo.h +++ b/libinterp/corefcn/syminfo.h @@ -51,7 +51,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API symbol_info { public: @@ -88,7 +88,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API symbol_info_list : public base_list { public: diff --git a/libinterp/corefcn/symtab.h b/libinterp/corefcn/symtab.h --- a/libinterp/corefcn/symtab.h +++ b/libinterp/corefcn/symtab.h @@ -50,7 +50,7 @@ namespace octave { class interpreter; - class OCTINTERP_API symbol_table + class OCTAVE_API symbol_table { public: diff --git a/libinterp/corefcn/sysdep.h b/libinterp/corefcn/sysdep.h --- a/libinterp/corefcn/sysdep.h +++ b/libinterp/corefcn/sysdep.h @@ -37,26 +37,26 @@ namespace octave { - extern OCTINTERP_API void sysdep_init (void); + extern OCTAVE_API void sysdep_init (void); - extern OCTINTERP_API void set_application_id (void); + extern OCTAVE_API void set_application_id (void); - extern OCTINTERP_API void sysdep_cleanup (void); + extern OCTAVE_API void sysdep_cleanup (void); - extern OCTINTERP_API void raw_mode (bool, bool wait = true); + extern OCTAVE_API void raw_mode (bool, bool wait = true); - extern OCTINTERP_API FILE * popen (const char *command, const char *mode); + extern OCTAVE_API FILE * popen (const char *command, const char *mode); - extern OCTINTERP_API int pclose (FILE *f); + extern OCTAVE_API int pclose (FILE *f); - extern OCTINTERP_API int kbhit (bool wait = true); + extern OCTAVE_API int kbhit (bool wait = true); - extern OCTINTERP_API std::string get_P_tmpdir (void); + extern OCTAVE_API std::string get_P_tmpdir (void); - extern OCTINTERP_API bool same_file_internal (const std::string&, + extern OCTAVE_API bool same_file_internal (const std::string&, const std::string&); - extern OCTINTERP_API bool drive_or_unc_share (const std::string&); + extern OCTAVE_API bool drive_or_unc_share (const std::string&); } #endif diff --git a/libinterp/corefcn/text-engine.h b/libinterp/corefcn/text-engine.h --- a/libinterp/corefcn/text-engine.h +++ b/libinterp/corefcn/text-engine.h @@ -52,7 +52,7 @@ namespace octave class text_processor; class - OCTINTERP_API + OCTAVE_API text_element { public: @@ -67,7 +67,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_string : public text_element { public: @@ -88,7 +88,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_symbol : public text_element { public: @@ -111,7 +111,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_list : public text_element, public base_list { @@ -139,7 +139,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_subscript : public text_element { public: @@ -165,7 +165,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_superscript : public text_element { public: @@ -191,7 +191,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_combined : public text_element_list { public: @@ -206,7 +206,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_fontstyle : public text_element { public: @@ -235,7 +235,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_fontname : public text_element { public: @@ -256,7 +256,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_fontsize : public text_element { public: @@ -277,7 +277,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_element_color : public text_element { public: @@ -318,7 +318,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_processor { public: @@ -377,7 +377,7 @@ namespace octave TEXT_ELEMENT_ACCEPT(text_element_color) class - OCTINTERP_API + OCTAVE_API text_parser { public: @@ -393,7 +393,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_parser_none : public text_parser { public: @@ -413,7 +413,7 @@ namespace octave }; class - OCTINTERP_API + OCTAVE_API text_parser_tex : public text_parser { public: diff --git a/libinterp/corefcn/text-renderer.h b/libinterp/corefcn/text-renderer.h --- a/libinterp/corefcn/text-renderer.h +++ b/libinterp/corefcn/text-renderer.h @@ -42,7 +42,7 @@ namespace octave class text_element; class - OCTINTERP_API + OCTAVE_API text_renderer { public: diff --git a/libinterp/corefcn/url-handle-manager.h b/libinterp/corefcn/url-handle-manager.h --- a/libinterp/corefcn/url-handle-manager.h +++ b/libinterp/corefcn/url-handle-manager.h @@ -44,7 +44,7 @@ namespace octave { typedef octave_handle url_handle; - class OCTINTERP_API url_handle_manager + class OCTAVE_API url_handle_manager { public: diff --git a/libinterp/corefcn/utils.h b/libinterp/corefcn/utils.h --- a/libinterp/corefcn/utils.h +++ b/libinterp/corefcn/utils.h @@ -43,8 +43,8 @@ class string_vector; namespace octave { - extern OCTINTERP_API bool valid_identifier (const char *s); - extern OCTINTERP_API bool valid_identifier (const std::string& s); + extern OCTAVE_API bool valid_identifier (const char *s); + extern OCTAVE_API bool valid_identifier (const std::string& s); //! Helper class for `make_valid_name` function calls. //! @@ -52,7 +52,7 @@ namespace octave //! avoids expensive repetitive parsing of the very same options. class - OCTINTERP_API + OCTAVE_API make_valid_name_options { public: @@ -100,99 +100,99 @@ namespace octave //! //! @return true, if @p str was modified. - extern OCTINTERP_API bool + extern OCTAVE_API bool make_valid_name (std::string& str, const make_valid_name_options& options); - extern OCTINTERP_API bool + extern OCTAVE_API bool same_file (const std::string& f, const std::string& g); - extern OCTINTERP_API int almost_match (const std::string& std, + extern OCTAVE_API int almost_match (const std::string& std, const std::string& s, int min_match_len = 1, int case_sens = 1); - extern OCTINTERP_API int + extern OCTAVE_API int keyword_almost_match (const char * const *std, int *min_len, const std::string& s, int min_toks_to_match, int max_toks); - extern OCTINTERP_API std::string + extern OCTAVE_API std::string search_path_for_file (const std::string&, const string_vector&); - extern OCTINTERP_API string_vector + extern OCTAVE_API string_vector search_path_for_all_files (const std::string&, const string_vector&); - extern OCTINTERP_API std::string + extern OCTAVE_API std::string file_in_path (const std::string&, const std::string&); - extern OCTINTERP_API std::string + extern OCTAVE_API std::string find_data_file_in_load_path (const std::string& fcn, const std::string& file, bool require_regular_file = false); - extern OCTINTERP_API std::string contents_file_in_path (const std::string&); + extern OCTAVE_API std::string contents_file_in_path (const std::string&); - extern OCTINTERP_API std::string fcn_file_in_path (const std::string&); + extern OCTAVE_API std::string fcn_file_in_path (const std::string&); - extern OCTINTERP_API std::string do_string_escapes (const std::string& s); + extern OCTAVE_API std::string do_string_escapes (const std::string& s); - extern OCTINTERP_API const char * undo_string_escape (char c); + extern OCTAVE_API const char * undo_string_escape (char c); - extern OCTINTERP_API std::string undo_string_escapes (const std::string& s); + extern OCTAVE_API std::string undo_string_escapes (const std::string& s); - extern OCTINTERP_API void + extern OCTAVE_API void check_dimensions (dim_vector& dim, const char *warnfor); - extern OCTINTERP_API void + extern OCTAVE_API void get_dimensions (const octave_value& a, const char *warn_for, dim_vector& dim); - extern OCTINTERP_API void + extern OCTAVE_API void get_dimensions (const octave_value& a, const octave_value& b, const char *warn_for, octave_idx_type& nr, octave_idx_type& nc); - extern OCTINTERP_API void + extern OCTAVE_API void get_dimensions (const octave_value& a, const char *warn_for, octave_idx_type& nr, octave_idx_type& nc); - extern OCTINTERP_API octave_idx_type + extern OCTAVE_API octave_idx_type dims_to_numel (const dim_vector& dims, const octave_value_list& idx); - extern OCTINTERP_API Matrix + extern OCTAVE_API Matrix identity_matrix (octave_idx_type nr, octave_idx_type nc); - extern OCTINTERP_API FloatMatrix + extern OCTAVE_API FloatMatrix float_identity_matrix (octave_idx_type nr, octave_idx_type nc); - extern OCTINTERP_API size_t + extern OCTAVE_API size_t format (std::ostream& os, const char *fmt, ...); - extern OCTINTERP_API size_t + extern OCTAVE_API size_t format (std::ostream& os, const std::string& enc, const char *fmt, ...); - extern OCTINTERP_API size_t + extern OCTAVE_API size_t vformat (std::ostream& os, const char *fmt, va_list args); - extern OCTINTERP_API size_t + extern OCTAVE_API size_t vformat (std::ostream& os, const std::string& enc, const char *fmt, va_list args); - extern OCTINTERP_API std::string + extern OCTAVE_API std::string vasprintf (const char *fmt, va_list args); - extern OCTINTERP_API std::string asprintf (const char *fmt, ...); + extern OCTAVE_API std::string asprintf (const char *fmt, ...); - extern OCTINTERP_API void sleep (double seconds, + extern OCTAVE_API void sleep (double seconds, bool do_graphics_events = false); - extern OCTINTERP_API + extern OCTAVE_API octave_value_list do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), const char *fun_name, const octave_value_list& args, int nargout); - extern OCTINTERP_API + extern OCTAVE_API octave_value do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), const char *fun_name, const octave_value_list& args); diff --git a/libinterp/corefcn/variables.h b/libinterp/corefcn/variables.h --- a/libinterp/corefcn/variables.h +++ b/libinterp/corefcn/variables.h @@ -48,55 +48,55 @@ namespace octave #include "ov-builtin.h" -extern OCTINTERP_API octave_function * +extern OCTAVE_API octave_function * is_valid_function (const octave_value&, const std::string& = "", bool warn = false); -extern OCTINTERP_API octave_function * +extern OCTAVE_API octave_function * is_valid_function (const std::string&, const std::string& = "", bool warn = false); OCTAVE_DEPRECATED (6, "use 'octave::get_function_handle' instead") -extern OCTINTERP_API octave_function * +extern OCTAVE_API octave_function * extract_function (const octave_value& arg, const std::string& warn_for, const std::string& fname, const std::string& header, const std::string& trailer); -extern OCTINTERP_API int +extern OCTAVE_API int symbol_exist (const std::string& name, const std::string& type = "any"); -extern OCTINTERP_API std::string +extern OCTAVE_API std::string unique_symbol_name (const std::string& basename); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value set_internal_variable (bool& var, const octave_value_list& args, int nargout, const char *nm); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value set_internal_variable (char& var, const octave_value_list& args, int nargout, const char *nm); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value set_internal_variable (int& var, const octave_value_list& args, int nargout, const char *nm, int minval = std::numeric_limits::min (), int maxval = std::numeric_limits::max ()); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value set_internal_variable (double& var, const octave_value_list& args, int nargout, const char *nm, double minval = -octave::numeric_limits::Inf (), double maxval = octave::numeric_limits::Inf ()); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value set_internal_variable (std::string& var, const octave_value_list& args, int nargout, const char *nm, bool empty_ok = true); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value set_internal_variable (std::string& var, const octave_value_list& args, int nargout, const char *nm, const char **choices); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value set_internal_variable (int& var, const octave_value_list& args, int nargout, const char *nm, const char **choices); @@ -113,7 +113,7 @@ set_internal_variable (int& var, const o #define SET_INTERNAL_VARIABLE_CHOICES(NM, CHOICES) \ set_internal_variable (V ## NM, args, nargout, #NM, CHOICES) -extern OCTINTERP_API std::string +extern OCTAVE_API std::string maybe_missing_function_hook (const std::string& name); #endif diff --git a/libinterp/corefcn/xnorm.h b/libinterp/corefcn/xnorm.h --- a/libinterp/corefcn/xnorm.h +++ b/libinterp/corefcn/xnorm.h @@ -32,16 +32,16 @@ class octave_value; -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value xnorm (const octave_value& x, const octave_value& p); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value xcolnorms (const octave_value& x, const octave_value& p); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value xrownorms (const octave_value& x, const octave_value& p); -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value xfrobnorm (const octave_value& x); #endif diff --git a/libinterp/corefcn/xpow.h b/libinterp/corefcn/xpow.h --- a/libinterp/corefcn/xpow.h +++ b/libinterp/corefcn/xpow.h @@ -46,161 +46,161 @@ class FloatComplexNDArray; class octave_value; class Range; -extern OCTINTERP_API octave_value xpow (double a, double b); -extern OCTINTERP_API octave_value xpow (double a, const Matrix& b); -extern OCTINTERP_API octave_value xpow (double a, const Complex& b); -extern OCTINTERP_API octave_value xpow (double a, const ComplexMatrix& b); +extern OCTAVE_API octave_value xpow (double a, double b); +extern OCTAVE_API octave_value xpow (double a, const Matrix& b); +extern OCTAVE_API octave_value xpow (double a, const Complex& b); +extern OCTAVE_API octave_value xpow (double a, const ComplexMatrix& b); -extern OCTINTERP_API octave_value xpow (const Matrix& a, double b); -extern OCTINTERP_API octave_value xpow (const Matrix& a, const Complex& b); +extern OCTAVE_API octave_value xpow (const Matrix& a, double b); +extern OCTAVE_API octave_value xpow (const Matrix& a, const Complex& b); -extern OCTINTERP_API octave_value xpow (const DiagMatrix& a, double b); -extern OCTINTERP_API octave_value xpow (const DiagMatrix& a, const Complex& b); +extern OCTAVE_API octave_value xpow (const DiagMatrix& a, double b); +extern OCTAVE_API octave_value xpow (const DiagMatrix& a, const Complex& b); -extern OCTINTERP_API octave_value xpow (const PermMatrix& a, double b); +extern OCTAVE_API octave_value xpow (const PermMatrix& a, double b); -extern OCTINTERP_API octave_value xpow (const Complex& a, double b); -extern OCTINTERP_API octave_value xpow (const Complex& a, const Matrix& b); -extern OCTINTERP_API octave_value xpow (const Complex& a, const Complex& b); -extern OCTINTERP_API octave_value xpow (const Complex& a, +extern OCTAVE_API octave_value xpow (const Complex& a, double b); +extern OCTAVE_API octave_value xpow (const Complex& a, const Matrix& b); +extern OCTAVE_API octave_value xpow (const Complex& a, const Complex& b); +extern OCTAVE_API octave_value xpow (const Complex& a, const ComplexMatrix& b); -extern OCTINTERP_API octave_value xpow (const ComplexMatrix& a, double b); -extern OCTINTERP_API octave_value xpow (const ComplexMatrix& a, +extern OCTAVE_API octave_value xpow (const ComplexMatrix& a, double b); +extern OCTAVE_API octave_value xpow (const ComplexMatrix& a, const Complex& b); -extern OCTINTERP_API octave_value xpow (const ComplexDiagMatrix& a, double b); -extern OCTINTERP_API octave_value xpow (const ComplexDiagMatrix& a, +extern OCTAVE_API octave_value xpow (const ComplexDiagMatrix& a, double b); +extern OCTAVE_API octave_value xpow (const ComplexDiagMatrix& a, const Complex& b); -extern OCTINTERP_API octave_value elem_xpow (double a, const Matrix& b); -extern OCTINTERP_API octave_value elem_xpow (double a, const ComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (double a, const octave::range& r); +extern OCTAVE_API octave_value elem_xpow (double a, const Matrix& b); +extern OCTAVE_API octave_value elem_xpow (double a, const ComplexMatrix& b); +extern OCTAVE_API octave_value elem_xpow (double a, const octave::range& r); -extern OCTINTERP_API octave_value elem_xpow (const Matrix& a, double b); -extern OCTINTERP_API octave_value elem_xpow (const Matrix& a, const Matrix& b); -extern OCTINTERP_API octave_value elem_xpow (const Matrix& a, const Complex& b); -extern OCTINTERP_API octave_value elem_xpow (const Matrix& a, +extern OCTAVE_API octave_value elem_xpow (const Matrix& a, double b); +extern OCTAVE_API octave_value elem_xpow (const Matrix& a, const Matrix& b); +extern OCTAVE_API octave_value elem_xpow (const Matrix& a, const Complex& b); +extern OCTAVE_API octave_value elem_xpow (const Matrix& a, const ComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const Complex& a, const Matrix& b); -extern OCTINTERP_API octave_value elem_xpow (const Complex& a, +extern OCTAVE_API octave_value elem_xpow (const Complex& a, const Matrix& b); +extern OCTAVE_API octave_value elem_xpow (const Complex& a, const ComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const Complex& a, const octave::range& r); +extern OCTAVE_API octave_value elem_xpow (const Complex& a, const octave::range& r); -extern OCTINTERP_API octave_value elem_xpow (const ComplexMatrix& a, double b); -extern OCTINTERP_API octave_value elem_xpow (const ComplexMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const ComplexMatrix& a, double b); +extern OCTAVE_API octave_value elem_xpow (const ComplexMatrix& a, const Matrix& b); -extern OCTINTERP_API octave_value elem_xpow (const ComplexMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const ComplexMatrix& a, const Complex& b); -extern OCTINTERP_API octave_value elem_xpow (const ComplexMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const ComplexMatrix& a, const ComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (double a, const NDArray& b); -extern OCTINTERP_API octave_value elem_xpow (double a, const ComplexNDArray& b); +extern OCTAVE_API octave_value elem_xpow (double a, const NDArray& b); +extern OCTAVE_API octave_value elem_xpow (double a, const ComplexNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const NDArray& a, double b); -extern OCTINTERP_API octave_value elem_xpow (const NDArray& a, +extern OCTAVE_API octave_value elem_xpow (const NDArray& a, double b); +extern OCTAVE_API octave_value elem_xpow (const NDArray& a, const NDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const NDArray& a, +extern OCTAVE_API octave_value elem_xpow (const NDArray& a, const Complex& b); -extern OCTINTERP_API octave_value elem_xpow (const NDArray& a, +extern OCTAVE_API octave_value elem_xpow (const NDArray& a, const ComplexNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const Complex& a, +extern OCTAVE_API octave_value elem_xpow (const Complex& a, const NDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const Complex& a, +extern OCTAVE_API octave_value elem_xpow (const Complex& a, const ComplexNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const ComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const ComplexNDArray& a, double b); -extern OCTINTERP_API octave_value elem_xpow (const ComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const ComplexNDArray& a, const NDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const ComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const ComplexNDArray& a, const Complex& b); -extern OCTINTERP_API octave_value elem_xpow (const ComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const ComplexNDArray& a, const ComplexNDArray& b); -extern OCTINTERP_API octave_value xpow (float a, float b); -extern OCTINTERP_API octave_value xpow (float a, const FloatMatrix& b); -extern OCTINTERP_API octave_value xpow (float a, const FloatComplex& b); -extern OCTINTERP_API octave_value xpow (float a, const FloatComplexMatrix& b); +extern OCTAVE_API octave_value xpow (float a, float b); +extern OCTAVE_API octave_value xpow (float a, const FloatMatrix& b); +extern OCTAVE_API octave_value xpow (float a, const FloatComplex& b); +extern OCTAVE_API octave_value xpow (float a, const FloatComplexMatrix& b); -extern OCTINTERP_API octave_value xpow (const FloatMatrix& a, float b); -extern OCTINTERP_API octave_value xpow (const FloatMatrix& a, +extern OCTAVE_API octave_value xpow (const FloatMatrix& a, float b); +extern OCTAVE_API octave_value xpow (const FloatMatrix& a, const FloatComplex& b); -extern OCTINTERP_API octave_value xpow (const FloatDiagMatrix& a, float b); -extern OCTINTERP_API octave_value xpow (const FloatDiagMatrix& a, +extern OCTAVE_API octave_value xpow (const FloatDiagMatrix& a, float b); +extern OCTAVE_API octave_value xpow (const FloatDiagMatrix& a, const FloatComplex& b); -extern OCTINTERP_API octave_value xpow (const FloatComplex& a, float b); -extern OCTINTERP_API octave_value xpow (const FloatComplex& a, +extern OCTAVE_API octave_value xpow (const FloatComplex& a, float b); +extern OCTAVE_API octave_value xpow (const FloatComplex& a, const FloatMatrix& b); -extern OCTINTERP_API octave_value xpow (const FloatComplex& a, +extern OCTAVE_API octave_value xpow (const FloatComplex& a, const FloatComplex& b); -extern OCTINTERP_API octave_value xpow (const FloatComplex& a, +extern OCTAVE_API octave_value xpow (const FloatComplex& a, const FloatComplexMatrix& b); -extern OCTINTERP_API octave_value xpow (const FloatComplexMatrix& a, float b); -extern OCTINTERP_API octave_value xpow (const FloatComplexMatrix& a, +extern OCTAVE_API octave_value xpow (const FloatComplexMatrix& a, float b); +extern OCTAVE_API octave_value xpow (const FloatComplexMatrix& a, const FloatComplex& b); -extern OCTINTERP_API octave_value xpow (const FloatComplexDiagMatrix& a, +extern OCTAVE_API octave_value xpow (const FloatComplexDiagMatrix& a, float b); -extern OCTINTERP_API octave_value xpow (const FloatComplexDiagMatrix& a, +extern OCTAVE_API octave_value xpow (const FloatComplexDiagMatrix& a, const FloatComplex& b); -extern OCTINTERP_API octave_value elem_xpow (float a, const FloatMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (float a, +extern OCTAVE_API octave_value elem_xpow (float a, const FloatMatrix& b); +extern OCTAVE_API octave_value elem_xpow (float a, const FloatComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatMatrix& a, float b); -extern OCTINTERP_API octave_value elem_xpow (const FloatMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const FloatMatrix& a, float b); +extern OCTAVE_API octave_value elem_xpow (const FloatMatrix& a, const FloatMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const FloatMatrix& a, const FloatComplex& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const FloatMatrix& a, const FloatComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplex& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplex& a, const FloatMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplex& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplex& a, const FloatComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexMatrix& a, float b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexMatrix& a, const FloatMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexMatrix& a, const FloatComplex& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexMatrix& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexMatrix& a, const FloatComplexMatrix& b); -extern OCTINTERP_API octave_value elem_xpow (float a, const FloatNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (float a, +extern OCTAVE_API octave_value elem_xpow (float a, const FloatNDArray& b); +extern OCTAVE_API octave_value elem_xpow (float a, const FloatComplexNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatNDArray& a, float b); -extern OCTINTERP_API octave_value elem_xpow (const FloatNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const FloatNDArray& a, float b); +extern OCTAVE_API octave_value elem_xpow (const FloatNDArray& a, const FloatNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const FloatNDArray& a, const FloatComplex& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const FloatNDArray& a, const FloatComplexNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplex& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplex& a, const FloatNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplex& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplex& a, const FloatComplexNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexNDArray& a, float b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexNDArray& a, const FloatNDArray& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexNDArray& a, const FloatComplex& b); -extern OCTINTERP_API octave_value elem_xpow (const FloatComplexNDArray& a, +extern OCTAVE_API octave_value elem_xpow (const FloatComplexNDArray& a, const FloatComplexNDArray& b); #endif diff --git a/libinterp/liboctinterp-build-info.h b/libinterp/liboctinterp-build-info.h --- a/libinterp/liboctinterp-build-info.h +++ b/libinterp/liboctinterp-build-info.h @@ -32,6 +32,6 @@ #include -extern OCTINTERP_API std::string liboctinterp_hg_id (void); +extern OCTAVE_API std::string liboctinterp_hg_id (void); #endif diff --git a/libinterp/mk-builtins.pl b/libinterp/mk-builtins.pl --- a/libinterp/mk-builtins.pl +++ b/libinterp/mk-builtins.pl @@ -107,13 +107,13 @@ namespace octave { if ($is_method) { - print "extern OCTINTERP_API octave_value_list + print "extern OCTAVE_API octave_value_list $name (octave::interpreter&, const octave_value_list& = octave_value_list (), int = 0); "; } else { - print "extern OCTINTERP_API octave_value_list + print "extern OCTAVE_API octave_value_list $name (const octave_value_list& = octave_value_list (), int = 0); "; } diff --git a/libinterp/octave-value/ov-base.h b/libinterp/octave-value/ov-base.h --- a/libinterp/octave-value/ov-base.h +++ b/libinterp/octave-value/ov-base.h @@ -91,7 +91,7 @@ enum builtin_type_t btyp_num_types = btyp_unknown }; -extern OCTINTERP_API std::string btyp_class_name []; +extern OCTAVE_API std::string btyp_class_name []; inline bool btyp_isnumeric (builtin_type_t btyp) { return btyp <= btyp_uint64; } @@ -118,7 +118,7 @@ inline bool btyp_isarray (builtin_type_t //! @return The resulting type or "unknown type", if the resulting type cannot //! be determined. -extern OCTINTERP_API +extern OCTAVE_API builtin_type_t btyp_mixed_numeric (builtin_type_t x, builtin_type_t y); template @@ -224,7 +224,7 @@ DEF_BTYP_TRAITS (btyp_char, char); // octave_value). class -OCTINTERP_API +OCTAVE_API octave_base_value { public: @@ -921,18 +921,18 @@ private: // TRUE means to perform automatic sparse to real mutation if there // is memory to be saved -extern OCTINTERP_API bool Vsparse_auto_mutate; +extern OCTAVE_API bool Vsparse_auto_mutate; // Utility function to convert C++ arguments used in subsref/subsasgn into an // octave_value_list object that can be used to call a function/method in the // interpreter. -extern OCTINTERP_API octave_value +extern OCTAVE_API octave_value make_idx_args (const std::string& type, const std::list& idx, const std::string& who); // Tells whether some regular octave_value_base methods are being called from // within the "builtin" function. -extern OCTINTERP_API bool called_from_builtin (void); +extern OCTAVE_API bool called_from_builtin (void); #endif diff --git a/libinterp/octave-value/ov-bool-sparse.h b/libinterp/octave-value/ov-bool-sparse.h --- a/libinterp/octave-value/ov-bool-sparse.h +++ b/libinterp/octave-value/ov-bool-sparse.h @@ -48,7 +48,7 @@ class octave_value_list; class -OCTINTERP_API +OCTAVE_API octave_sparse_bool_matrix : public octave_base_sparse { public: diff --git a/libinterp/octave-value/ov-bool.h b/libinterp/octave-value/ov-bool.h --- a/libinterp/octave-value/ov-bool.h +++ b/libinterp/octave-value/ov-bool.h @@ -49,7 +49,7 @@ class octave_value_list; // Real scalar values. class -OCTINTERP_API +OCTAVE_API octave_bool : public octave_base_scalar { public: diff --git a/libinterp/octave-value/ov-builtin.h b/libinterp/octave-value/ov-builtin.h --- a/libinterp/octave-value/ov-builtin.h +++ b/libinterp/octave-value/ov-builtin.h @@ -48,7 +48,7 @@ namespace octave // Builtin functions. class -OCTINTERP_API +OCTAVE_API octave_builtin : public octave_function { public: diff --git a/libinterp/octave-value/ov-classdef.h b/libinterp/octave-value/ov-classdef.h --- a/libinterp/octave-value/ov-classdef.h +++ b/libinterp/octave-value/ov-classdef.h @@ -160,7 +160,7 @@ private: static const std::string t_name; }; -OCTINTERP_API void install_classdef (octave::interpreter& interp); +OCTAVE_API void install_classdef (octave::interpreter& interp); class octave_classdef_meta : public octave_function { diff --git a/libinterp/octave-value/ov-complex.h b/libinterp/octave-value/ov-complex.h --- a/libinterp/octave-value/ov-complex.h +++ b/libinterp/octave-value/ov-complex.h @@ -49,7 +49,7 @@ class octave_value_list; // Complex scalar values. class -OCTINTERP_API +OCTAVE_API octave_complex : public octave_base_scalar { public: diff --git a/libinterp/octave-value/ov-cx-diag.h b/libinterp/octave-value/ov-cx-diag.h --- a/libinterp/octave-value/ov-cx-diag.h +++ b/libinterp/octave-value/ov-cx-diag.h @@ -36,7 +36,7 @@ // Real diagonal matrix values. class -OCTINTERP_API +OCTAVE_API octave_complex_diag_matrix : public octave_base_diag { diff --git a/libinterp/octave-value/ov-cx-mat.h b/libinterp/octave-value/ov-cx-mat.h --- a/libinterp/octave-value/ov-cx-mat.h +++ b/libinterp/octave-value/ov-cx-mat.h @@ -49,7 +49,7 @@ class octave_value_list; // Complex matrix values. class -OCTINTERP_API +OCTAVE_API octave_complex_matrix : public octave_base_matrix { public: diff --git a/libinterp/octave-value/ov-cx-sparse.h b/libinterp/octave-value/ov-cx-sparse.h --- a/libinterp/octave-value/ov-cx-sparse.h +++ b/libinterp/octave-value/ov-cx-sparse.h @@ -48,7 +48,7 @@ class octave_value_list; class -OCTINTERP_API +OCTAVE_API octave_sparse_complex_matrix : public octave_base_sparse { public: diff --git a/libinterp/octave-value/ov-dld-fcn.h b/libinterp/octave-value/ov-dld-fcn.h --- a/libinterp/octave-value/ov-dld-fcn.h +++ b/libinterp/octave-value/ov-dld-fcn.h @@ -42,7 +42,7 @@ class octave_value_list; // Dynamically-linked functions. class -OCTINTERP_API +OCTAVE_API octave_dld_function : public octave_builtin { public: diff --git a/libinterp/octave-value/ov-fcn-handle.h b/libinterp/octave-value/ov-fcn-handle.h --- a/libinterp/octave-value/ov-fcn-handle.h +++ b/libinterp/octave-value/ov-fcn-handle.h @@ -158,7 +158,7 @@ namespace octave } class -OCTINTERP_API +OCTAVE_API octave_fcn_handle : public octave_base_value { public: diff --git a/libinterp/octave-value/ov-fcn.h b/libinterp/octave-value/ov-fcn.h --- a/libinterp/octave-value/ov-fcn.h +++ b/libinterp/octave-value/ov-fcn.h @@ -48,7 +48,7 @@ namespace octave // Functions. class -OCTINTERP_API +OCTAVE_API octave_function : public octave_base_value { public: diff --git a/libinterp/octave-value/ov-float.h b/libinterp/octave-value/ov-float.h --- a/libinterp/octave-value/ov-float.h +++ b/libinterp/octave-value/ov-float.h @@ -51,7 +51,7 @@ class octave_value_list; // Real scalar values. class -OCTINTERP_API +OCTAVE_API octave_float_scalar : public octave_base_scalar { public: diff --git a/libinterp/octave-value/ov-flt-complex.h b/libinterp/octave-value/ov-flt-complex.h --- a/libinterp/octave-value/ov-flt-complex.h +++ b/libinterp/octave-value/ov-flt-complex.h @@ -49,7 +49,7 @@ class octave_value_list; // Complex scalar values. class -OCTINTERP_API +OCTAVE_API octave_float_complex : public octave_base_scalar { public: diff --git a/libinterp/octave-value/ov-flt-cx-diag.h b/libinterp/octave-value/ov-flt-cx-diag.h --- a/libinterp/octave-value/ov-flt-cx-diag.h +++ b/libinterp/octave-value/ov-flt-cx-diag.h @@ -36,7 +36,7 @@ // Real diagonal matrix values. class -OCTINTERP_API +OCTAVE_API octave_float_complex_diag_matrix : public octave_base_diag { diff --git a/libinterp/octave-value/ov-flt-cx-mat.h b/libinterp/octave-value/ov-flt-cx-mat.h --- a/libinterp/octave-value/ov-flt-cx-mat.h +++ b/libinterp/octave-value/ov-flt-cx-mat.h @@ -49,7 +49,7 @@ class octave_value_list; // Complex matrix values. class -OCTINTERP_API +OCTAVE_API octave_float_complex_matrix : public octave_base_matrix { public: diff --git a/libinterp/octave-value/ov-flt-re-diag.h b/libinterp/octave-value/ov-flt-re-diag.h --- a/libinterp/octave-value/ov-flt-re-diag.h +++ b/libinterp/octave-value/ov-flt-re-diag.h @@ -36,7 +36,7 @@ // Real diagonal matrix values. class -OCTINTERP_API +OCTAVE_API octave_float_diag_matrix : public octave_base_diag { diff --git a/libinterp/octave-value/ov-flt-re-mat.h b/libinterp/octave-value/ov-flt-re-mat.h --- a/libinterp/octave-value/ov-flt-re-mat.h +++ b/libinterp/octave-value/ov-flt-re-mat.h @@ -49,7 +49,7 @@ class octave_value_list; // Real matrix values. class -OCTINTERP_API +OCTAVE_API octave_float_matrix : public octave_base_matrix { public: diff --git a/libinterp/octave-value/ov-intx.h b/libinterp/octave-value/ov-intx.h --- a/libinterp/octave-value/ov-intx.h +++ b/libinterp/octave-value/ov-intx.h @@ -50,7 +50,7 @@ #include "ov-scalar.h" class -OCTINTERP_API +OCTAVE_API OCTAVE_VALUE_INT_MATRIX_T : public octave_base_int_matrix> { @@ -390,7 +390,7 @@ private: }; class -OCTINTERP_API +OCTAVE_API OCTAVE_VALUE_INT_SCALAR_T : public octave_base_int_scalar { diff --git a/libinterp/octave-value/ov-java.h b/libinterp/octave-value/ov-java.h --- a/libinterp/octave-value/ov-java.h +++ b/libinterp/octave-value/ov-java.h @@ -38,7 +38,7 @@ namespace octave typedef void *voidptr; -class OCTINTERP_API octave_java : public octave_base_value +class OCTAVE_API octave_java : public octave_base_value { public: @@ -194,10 +194,10 @@ private: static const std::string t_name; }; -extern OCTINTERP_API bool Vjava_matrix_autoconversion; +extern OCTAVE_API bool Vjava_matrix_autoconversion; -extern OCTINTERP_API bool Vjava_unsigned_autoconversion; +extern OCTAVE_API bool Vjava_unsigned_autoconversion; -extern OCTINTERP_API bool Vdebug_java; +extern OCTAVE_API bool Vdebug_java; #endif diff --git a/libinterp/octave-value/ov-lazy-idx.h b/libinterp/octave-value/ov-lazy-idx.h --- a/libinterp/octave-value/ov-lazy-idx.h +++ b/libinterp/octave-value/ov-lazy-idx.h @@ -34,7 +34,7 @@ // actually needed. class -OCTINTERP_API +OCTAVE_API octave_lazy_index : public octave_base_value { public: diff --git a/libinterp/octave-value/ov-magic-int.h b/libinterp/octave-value/ov-magic-int.h --- a/libinterp/octave-value/ov-magic-int.h +++ b/libinterp/octave-value/ov-magic-int.h @@ -272,7 +272,7 @@ public: }; class -OCTINTERP_API +OCTAVE_API octave_magic_uint : public octave_base_magic_int { public: @@ -298,7 +298,7 @@ private: }; class -OCTINTERP_API +OCTAVE_API octave_magic_int : public octave_base_magic_int { public: diff --git a/libinterp/octave-value/ov-null-mat.h b/libinterp/octave-value/ov-null-mat.h --- a/libinterp/octave-value/ov-null-mat.h +++ b/libinterp/octave-value/ov-null-mat.h @@ -42,7 +42,7 @@ // The special [] value. class -OCTINTERP_API +OCTAVE_API octave_null_matrix : public octave_matrix { octave_null_matrix (void) : octave_matrix () { } @@ -63,7 +63,7 @@ private: // The special "" value class -OCTINTERP_API +OCTAVE_API octave_null_str : public octave_char_matrix_str { octave_null_str (void) : octave_char_matrix_str () { } @@ -84,7 +84,7 @@ private: // The special '' value class -OCTINTERP_API +OCTAVE_API octave_null_sq_str : public octave_char_matrix_sq_str { octave_null_sq_str (void) : octave_char_matrix_sq_str () { } diff --git a/libinterp/octave-value/ov-perm.h b/libinterp/octave-value/ov-perm.h --- a/libinterp/octave-value/ov-perm.h +++ b/libinterp/octave-value/ov-perm.h @@ -36,7 +36,7 @@ #include "ovl.h" class -OCTINTERP_API +OCTAVE_API octave_perm_matrix : public octave_base_value { public: diff --git a/libinterp/octave-value/ov-re-diag.h b/libinterp/octave-value/ov-re-diag.h --- a/libinterp/octave-value/ov-re-diag.h +++ b/libinterp/octave-value/ov-re-diag.h @@ -36,7 +36,7 @@ // Real diagonal matrix values. class -OCTINTERP_API +OCTAVE_API octave_diag_matrix : public octave_base_diag { diff --git a/libinterp/octave-value/ov-re-mat.h b/libinterp/octave-value/ov-re-mat.h --- a/libinterp/octave-value/ov-re-mat.h +++ b/libinterp/octave-value/ov-re-mat.h @@ -49,7 +49,7 @@ class octave_value_list; // Real matrix values. class -OCTINTERP_API +OCTAVE_API octave_matrix : public octave_base_matrix { public: diff --git a/libinterp/octave-value/ov-re-sparse.h b/libinterp/octave-value/ov-re-sparse.h --- a/libinterp/octave-value/ov-re-sparse.h +++ b/libinterp/octave-value/ov-re-sparse.h @@ -49,7 +49,7 @@ class octave_value_list; class -OCTINTERP_API +OCTAVE_API octave_sparse_matrix : public octave_base_sparse { public: diff --git a/libinterp/octave-value/ov-scalar.h b/libinterp/octave-value/ov-scalar.h --- a/libinterp/octave-value/ov-scalar.h +++ b/libinterp/octave-value/ov-scalar.h @@ -50,7 +50,7 @@ class octave_value_list; // Real scalar values. class -OCTINTERP_API +OCTAVE_API octave_scalar : public octave_base_scalar { public: diff --git a/libinterp/octave-value/ov-str-mat.h b/libinterp/octave-value/ov-str-mat.h --- a/libinterp/octave-value/ov-str-mat.h +++ b/libinterp/octave-value/ov-str-mat.h @@ -49,7 +49,7 @@ class octave_value_list; // strings. class -OCTINTERP_API +OCTAVE_API octave_char_matrix_str : public octave_char_matrix { public: diff --git a/libinterp/octave-value/ov.h b/libinterp/octave-value/ov.h --- a/libinterp/octave-value/ov.h +++ b/libinterp/octave-value/ov.h @@ -65,7 +65,7 @@ class octave_value_list; #include "ov-base.h" class -OCTINTERP_API +OCTAVE_API octave_value { public: @@ -1535,38 +1535,38 @@ private: namespace octave { - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value unary_op (type_info& ti, octave_value::unary_op op, const octave_value& a); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value unary_op (octave_value::unary_op op, const octave_value& a); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value binary_op (type_info& ti, octave_value::binary_op op, const octave_value& a, const octave_value& b); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value binary_op (type_info& ti, octave_value::compound_binary_op op, const octave_value& a, const octave_value& b); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value binary_op (octave_value::binary_op op, const octave_value& a, const octave_value& b); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value binary_op (octave_value::compound_binary_op op, const octave_value& a, const octave_value& b); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value cat_op (type_info& ti, const octave_value& a, const octave_value& b, const Array& ra_idx); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value cat_op (const octave_value& a, const octave_value& b, const Array& ra_idx); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value colon_op (const octave_value& base, const octave_value& increment, const octave_value& limit, bool is_for_cmd_expr = false); @@ -1747,7 +1747,7 @@ OV_COMP_BINOP_FN (op_mul_trans) OV_COMP_BINOP_FN (op_herm_mul) OV_COMP_BINOP_FN (op_mul_herm) -extern OCTINTERP_API void install_types (octave::type_info&); +extern OCTAVE_API void install_types (octave::type_info&); // Templated value extractors. template diff --git a/libinterp/octave-value/ovl.h b/libinterp/octave-value/ovl.h --- a/libinterp/octave-value/ovl.h +++ b/libinterp/octave-value/ovl.h @@ -39,7 +39,7 @@ #include "Cell.h" class -OCTINTERP_API +OCTAVE_API octave_value_list { public: diff --git a/libinterp/octave.h b/libinterp/octave.h --- a/libinterp/octave.h +++ b/libinterp/octave.h @@ -39,7 +39,7 @@ namespace octave { // Command line arguments. See also options-usage.h. - class OCTINTERP_API cmdline_options + class OCTAVE_API cmdline_options { public: @@ -235,7 +235,7 @@ namespace octave // Base class for an Octave application. - class OCTINTERP_API application + class OCTAVE_API application { public: @@ -351,7 +351,7 @@ namespace octave interpreter *m_interpreter = nullptr; }; - class OCTINTERP_API cli_application : public application + class OCTAVE_API cli_application : public application { public: diff --git a/libinterp/parse-tree/bp-table.h b/libinterp/parse-tree/bp-table.h --- a/libinterp/parse-tree/bp-table.h +++ b/libinterp/parse-tree/bp-table.h @@ -50,7 +50,7 @@ namespace octave }; // Interface to breakpoints. - class OCTINTERP_API bp_table + class OCTAVE_API bp_table { public: diff --git a/libinterp/parse-tree/parse.h b/libinterp/parse-tree/parse.h --- a/libinterp/parse-tree/parse.h +++ b/libinterp/parse-tree/parse.h @@ -97,7 +97,7 @@ extern int octave_debug; namespace octave { - class OCTINTERP_API base_parser + class OCTAVE_API base_parser { private: @@ -591,14 +591,14 @@ namespace octave // Publish externally used friend functions. - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value parse_fcn_file (interpreter& interp, const std::string& full_file, const std::string& file, const std::string& dir_name, const std::string& dispatch_type, const std::string& package_name, bool require_file, bool force_script, bool autoload, bool relative_lookup); - class OCTINTERP_API parser : public base_parser + class OCTAVE_API parser : public base_parser { public: @@ -637,7 +637,7 @@ namespace octave int run (void); }; - class OCTINTERP_API push_parser : public base_parser + class OCTAVE_API push_parser : public base_parser { public: @@ -680,14 +680,14 @@ namespace octave std::shared_ptr m_reader; }; - extern OCTINTERP_API std::string + extern OCTAVE_API std::string get_help_from_file (const std::string& nm, bool& symbol_found, std::string& file); - extern OCTINTERP_API std::string + extern OCTAVE_API std::string get_help_from_file (const std::string& nm, bool& symbol_found); - extern OCTINTERP_API octave_value + extern OCTAVE_API octave_value load_fcn_from_file (const std::string& file_name, const std::string& dir_name = "", const std::string& dispatch_type = "", @@ -695,35 +695,35 @@ namespace octave const std::string& fcn_name = "", bool autoload = false); - extern OCTINTERP_API void + extern OCTAVE_API void source_file (const std::string& file_name, const std::string& context = "", bool verbose = false, bool require_file = true); - extern OCTINTERP_API octave_value_list + extern OCTAVE_API octave_value_list feval (const char *name, const octave_value_list& args = octave_value_list (), int nargout = 0); - extern OCTINTERP_API octave_value_list + extern OCTAVE_API octave_value_list feval (const std::string& name, const octave_value_list& args = octave_value_list (), int nargout = 0); - extern OCTINTERP_API octave_value_list + extern OCTAVE_API octave_value_list feval (octave_function *fcn, const octave_value_list& args = octave_value_list (), int nargout = 0); - extern OCTINTERP_API octave_value_list + extern OCTAVE_API octave_value_list feval (const octave_value& val, const octave_value_list& args = octave_value_list (), int nargout = 0); - extern OCTINTERP_API octave_value_list + extern OCTAVE_API octave_value_list feval (const octave_value_list& args, int nargout = 0); - extern OCTINTERP_API void + extern OCTAVE_API void cleanup_statement_list (tree_statement_list **lst); } diff --git a/libinterp/parse-tree/profiler.h b/libinterp/parse-tree/profiler.h --- a/libinterp/parse-tree/profiler.h +++ b/libinterp/parse-tree/profiler.h @@ -39,7 +39,7 @@ class octave_value; namespace octave { class - OCTINTERP_API + OCTAVE_API profiler { public: diff --git a/libinterp/parse-tree/pt-eval.h b/libinterp/parse-tree/pt-eval.h --- a/libinterp/parse-tree/pt-eval.h +++ b/libinterp/parse-tree/pt-eval.h @@ -59,7 +59,7 @@ namespace octave // How to evaluate the code that the parse trees represent. - class OCTINTERP_API tree_evaluator : public tree_walker + class OCTAVE_API tree_evaluator : public tree_walker { public: diff --git a/libinterp/template-inst/Array-jit.cc b/libinterp/template-inst/Array-jit.cc --- a/libinterp/template-inst/Array-jit.cc +++ b/libinterp/template-inst/Array-jit.cc @@ -42,7 +42,7 @@ extern template class Array; NO_INSTANTIATE_ARRAY_SORT (octave_value); -INSTANTIATE_ARRAY (octave_value, OCTINTERP_API); +INSTANTIATE_ARRAY (octave_value, OCTAVE_API); NO_INSTANTIATE_ARRAY_SORT (octave_value *); -INSTANTIATE_ARRAY (octave_value *, OCTINTERP_API); +INSTANTIATE_ARRAY (octave_value *, OCTAVE_API); NO_INSTANTIATE_ARRAY_SORT (octave::cdef_object); -INSTANTIATE_ARRAY (octave::cdef_object, OCTINTERP_API); +INSTANTIATE_ARRAY (octave::cdef_object, OCTAVE_API); diff --git a/liboctave/array/Sparse.cc b/liboctave/array/Sparse.cc --- a/liboctave/array/Sparse.cc +++ b/liboctave/array/Sparse.cc @@ -3024,7 +3024,7 @@ Sparse::print_info (std::ostream& os, } #define INSTANTIATE_SPARSE(T, API) \ - template class API Sparse; \ + template class Sparse; \ template std::istream& \ read_sparse_matrix (std::istream& is, Sparse& a, \ T (*read_fcn) (std::istream&)); diff --git a/oct-conf-post.in.h b/oct-conf-post.in.h --- a/oct-conf-post.in.h +++ b/oct-conf-post.in.h @@ -183,33 +183,13 @@ typedef unsigned long ino_t; #endif /* API macro for liboctave */ -#if defined (OCTAVE_DLL) +#if (defined (OCTAVE_DLL) || defined (OCTINTERP_DLL) \ + || defined (OCTGRAPHICS_DLL) || defined (OCTGUI_DLL)) # define OCTAVE_API OCTAVE_EXPORT #else # define OCTAVE_API OCTAVE_IMPORT #endif -/* API macro for libinterp */ -#if defined (OCTINTERP_DLL) -# define OCTINTERP_API OCTAVE_EXPORT -#else -# define OCTINTERP_API OCTAVE_IMPORT -#endif - -/* API macro for libinterp/graphics */ -#if defined (OCTGRAPHICS_DLL) -# define OCTGRAPHICS_API OCTAVE_EXPORT -#else -# define OCTGRAPHICS_API OCTAVE_IMPORT -#endif - -/* API macro for libgui */ -#if defined (OCTGUI_DLL) -# define OCTGUI_API OCTAVE_EXPORT -#else -# define OCTGUI_API OCTAVE_IMPORT -#endif - /* Backward compatibility */ #if defined (OCTAVE_ENABLE_64)