# HG changeset patch # User Markus Mützel # Date 1608645644 -3600 # Tue Dec 22 15:00:44 2020 +0100 # Node ID 19a51c2f2752a03fbf3a9ed9816863ce460cd495 # Parent 497b8c85805a720fc92b859ba431b99bfca86bae visibility part 3 diff -r 497b8c85805a -r 19a51c2f2752 libinterp/build-env.h --- a/libinterp/build-env.h Wed Dec 16 01:33:57 2020 -0500 +++ b/libinterp/build-env.h Tue Dec 22 15:00:44 2020 +0100 @@ -36,150 +36,150 @@ { extern OCTAVE_API octave_scalar_map features (void); - extern const char *AMD_CPPFLAGS; - extern const char *AMD_LDFLAGS; - extern const char *AMD_LIBS; - extern const char *ARFLAGS; - extern const char *AR; - extern const char *ARPACK_CPPFLAGS; - extern const char *ARPACK_LDFLAGS; - extern const char *ARPACK_LIBS; - extern const char *BLAS_LIBS; - extern const char *CAMD_CPPFLAGS; - extern const char *CAMD_LDFLAGS; - extern const char *CAMD_LIBS; - extern const char *CARBON_LIBS; - extern const char *CC; - extern const char *CCOLAMD_CPPFLAGS; - extern const char *CCOLAMD_LDFLAGS; - extern const char *CCOLAMD_LIBS; - extern const char *CFLAGS; - extern const char *CHOLMOD_CPPFLAGS; - extern const char *CHOLMOD_LDFLAGS; - extern const char *CHOLMOD_LIBS; - extern const char *COLAMD_CPPFLAGS; - extern const char *COLAMD_LDFLAGS; - extern const char *COLAMD_LIBS; - extern const char *CPICFLAG; - extern const char *CPPFLAGS; - extern const char *CURL_CPPFLAGS; - extern const char *CURL_LDFLAGS; - extern const char *CURL_LIBS; - extern const char *CXSPARSE_CPPFLAGS; - extern const char *CXSPARSE_LDFLAGS; - extern const char *CXSPARSE_LIBS; - extern const char *CXXCPP; - extern const char *CXXFLAGS; - extern const char *CXXPICFLAG; - extern const char *CXX; - extern const char *DEFAULT_PAGER; - extern const char *DEFS; - extern const char *DL_LDFLAGS; - extern const char *EXEEXT; - extern const char *GCC_VERSION; - extern const char *GXX_VERSION; - extern const char *F77; - extern const char *F77_FLOAT_STORE_FLAG; - extern const char *F77_INTEGER_8_FLAG; - extern const char *FFLAGS; - extern const char *FFTW3_CPPFLAGS; - extern const char *FFTW3_LDFLAGS; - extern const char *FFTW3_LIBS; - extern const char *FFTW3F_CPPFLAGS; - extern const char *FFTW3F_LDFLAGS; - extern const char *FFTW3F_LIBS; - extern const char *FLIBS; - extern const char *FLTK_CPPFLAGS; - extern const char *FLTK_LDFLAGS; - extern const char *FLTK_LIBS; - extern const char *FONTCONFIG_CPPFLAGS; - extern const char *FONTCONFIG_LIBS; - extern const char *FPICFLAG; - extern const char *FT2_CPPFLAGS; - extern const char *FT2_LIBS; - extern const char *GLPK_CPPFLAGS; - extern const char *GLPK_LDFLAGS; - extern const char *GLPK_LIBS; - extern const char *GNUPLOT; - extern const char *HDF5_CPPFLAGS; - extern const char *HDF5_LDFLAGS; - extern const char *HDF5_LIBS; - extern const char *INCLUDEDIR; - extern const char *KLU_CPPFLAGS; - extern const char *KLU_LDFLAGS; - extern const char *KLU_LIBS; - extern const char *LAPACK_LIBS; - extern const char *LDFLAGS; - extern const char *LD_STATIC_FLAG; - extern const char *LEXLIB; - extern const char *LEX; - extern const char *LFLAGS; - extern const char *LIBOCTAVE; - extern const char *LIBOCTINTERP; - extern const char *LIBS; - extern const char *LN_S; - extern const char *MAGICK_CPPFLAGS; - extern const char *MAGICK_LDFLAGS; - extern const char *MAGICK_LIBS; - extern const char *LLVM_CPPFLAGS; - extern const char *LLVM_LDFLAGS; - extern const char *LLVM_LIBS; - extern const char *MKOCTFILE_DL_LDFLAGS; - extern const char *OCTAVE_LINK_DEPS; - extern const char *OCTAVE_LINK_OPTS; - extern const char *OCTINCLUDEDIR; - extern const char *OCTLIBDIR; - extern const char *OCT_LINK_DEPS; - extern const char *OCT_LINK_OPTS; - extern const char *OPENGL_LIBS; - extern const char *PCRE_CPPFLAGS; - extern const char *PCRE_LDFLAGS; - extern const char *PCRE_LIBS; - extern const char *PREFIX; - extern const char *PTHREAD_CFLAGS; - extern const char *PTHREAD_LIBS; - extern const char *QHULL_CPPFLAGS; - extern const char *QHULL_LDFLAGS; - extern const char *QHULL_LIBS; - extern const char *QRUPDATE_CPPFLAGS; - extern const char *QRUPDATE_LDFLAGS; - extern const char *QRUPDATE_LIBS; - extern const char *QT_CPPFLAGS; - extern const char *QT_LDFLAGS; - extern const char *QT_LIBS; - extern const char *QT_OPENGL_LIBS; - extern const char *RANLIB; - extern const char *RDYNAMIC_FLAG; - extern const char *READLINE_LIBS; - extern const char *SHARED_LIBS; - extern const char *SH_LDFLAGS; - extern const char *STATIC_LIBS; - extern const char *SUITESPARSECONFIG_LIBS; - extern const char *SUNDIALS_IDA_CPPFLAGS; - extern const char *SUNDIALS_IDA_LDFLAGS; - extern const char *SUNDIALS_IDA_LIBS; - extern const char *SUNDIALS_NVECSERIAL_CPPFLAGS; - extern const char *SUNDIALS_NVECSERIAL_LDFLAGS; - extern const char *SUNDIALS_NVECSERIAL_LIBS; - extern const char *SUNDIALS_SUNLINSOLKLU_CPPFLAGS; - extern const char *SUNDIALS_SUNLINSOLKLU_LDFLAGS; - extern const char *SUNDIALS_SUNLINSOLKLU_LIBS; - extern const char *TERM_LIBS; - extern const char *UMFPACK_CPPFLAGS; - extern const char *UMFPACK_LDFLAGS; - extern const char *UMFPACK_LIBS; - extern const char *WARN_CFLAGS; - extern const char *WARN_CXXFLAGS; - extern const char *X11_INCFLAGS; - extern const char *X11_LIBS; - extern const char *XTRA_CFLAGS; - extern const char *XTRA_CXXFLAGS; - extern const char *YACC; - extern const char *YFLAGS; - extern const char *Z_CPPFLAGS; - extern const char *Z_LDFLAGS; - extern const char *Z_LIBS; - extern const char *config_opts; + extern OCTAVE_API const char *AMD_CPPFLAGS; + extern OCTAVE_API const char *AMD_LDFLAGS; + extern OCTAVE_API const char *AMD_LIBS; + extern OCTAVE_API const char *ARFLAGS; + extern OCTAVE_API const char *AR; + extern OCTAVE_API const char *ARPACK_CPPFLAGS; + extern OCTAVE_API const char *ARPACK_LDFLAGS; + extern OCTAVE_API const char *ARPACK_LIBS; + extern OCTAVE_API const char *BLAS_LIBS; + extern OCTAVE_API const char *CAMD_CPPFLAGS; + extern OCTAVE_API const char *CAMD_LDFLAGS; + extern OCTAVE_API const char *CAMD_LIBS; + extern OCTAVE_API const char *CARBON_LIBS; + extern OCTAVE_API const char *CC; + extern OCTAVE_API const char *CCOLAMD_CPPFLAGS; + extern OCTAVE_API const char *CCOLAMD_LDFLAGS; + extern OCTAVE_API const char *CCOLAMD_LIBS; + extern OCTAVE_API const char *CFLAGS; + extern OCTAVE_API const char *CHOLMOD_CPPFLAGS; + extern OCTAVE_API const char *CHOLMOD_LDFLAGS; + extern OCTAVE_API const char *CHOLMOD_LIBS; + extern OCTAVE_API const char *COLAMD_CPPFLAGS; + extern OCTAVE_API const char *COLAMD_LDFLAGS; + extern OCTAVE_API const char *COLAMD_LIBS; + extern OCTAVE_API const char *CPICFLAG; + extern OCTAVE_API const char *CPPFLAGS; + extern OCTAVE_API const char *CURL_CPPFLAGS; + extern OCTAVE_API const char *CURL_LDFLAGS; + extern OCTAVE_API const char *CURL_LIBS; + extern OCTAVE_API const char *CXSPARSE_CPPFLAGS; + extern OCTAVE_API const char *CXSPARSE_LDFLAGS; + extern OCTAVE_API const char *CXSPARSE_LIBS; + extern OCTAVE_API const char *CXXCPP; + extern OCTAVE_API const char *CXXFLAGS; + extern OCTAVE_API const char *CXXPICFLAG; + extern OCTAVE_API const char *CXX; + extern OCTAVE_API const char *DEFAULT_PAGER; + extern OCTAVE_API const char *DEFS; + extern OCTAVE_API const char *DL_LDFLAGS; + extern OCTAVE_API const char *EXEEXT; + extern OCTAVE_API const char *GCC_VERSION; + extern OCTAVE_API const char *GXX_VERSION; + extern OCTAVE_API const char *F77; + extern OCTAVE_API const char *F77_FLOAT_STORE_FLAG; + extern OCTAVE_API const char *F77_INTEGER_8_FLAG; + extern OCTAVE_API const char *FFLAGS; + extern OCTAVE_API const char *FFTW3_CPPFLAGS; + extern OCTAVE_API const char *FFTW3_LDFLAGS; + extern OCTAVE_API const char *FFTW3_LIBS; + extern OCTAVE_API const char *FFTW3F_CPPFLAGS; + extern OCTAVE_API const char *FFTW3F_LDFLAGS; + extern OCTAVE_API const char *FFTW3F_LIBS; + extern OCTAVE_API const char *FLIBS; + extern OCTAVE_API const char *FLTK_CPPFLAGS; + extern OCTAVE_API const char *FLTK_LDFLAGS; + extern OCTAVE_API const char *FLTK_LIBS; + extern OCTAVE_API const char *FONTCONFIG_CPPFLAGS; + extern OCTAVE_API const char *FONTCONFIG_LIBS; + extern OCTAVE_API const char *FPICFLAG; + extern OCTAVE_API const char *FT2_CPPFLAGS; + extern OCTAVE_API const char *FT2_LIBS; + extern OCTAVE_API const char *GLPK_CPPFLAGS; + extern OCTAVE_API const char *GLPK_LDFLAGS; + extern OCTAVE_API const char *GLPK_LIBS; + extern OCTAVE_API const char *GNUPLOT; + extern OCTAVE_API const char *HDF5_CPPFLAGS; + extern OCTAVE_API const char *HDF5_LDFLAGS; + extern OCTAVE_API const char *HDF5_LIBS; + extern OCTAVE_API const char *INCLUDEDIR; + extern OCTAVE_API const char *KLU_CPPFLAGS; + extern OCTAVE_API const char *KLU_LDFLAGS; + extern OCTAVE_API const char *KLU_LIBS; + extern OCTAVE_API const char *LAPACK_LIBS; + extern OCTAVE_API const char *LDFLAGS; + extern OCTAVE_API const char *LD_STATIC_FLAG; + extern OCTAVE_API const char *LEXLIB; + extern OCTAVE_API const char *LEX; + extern OCTAVE_API const char *LFLAGS; + extern OCTAVE_API const char *LIBOCTAVE; + extern OCTAVE_API const char *LIBOCTINTERP; + extern OCTAVE_API const char *LIBS; + extern OCTAVE_API const char *LN_S; + extern OCTAVE_API const char *MAGICK_CPPFLAGS; + extern OCTAVE_API const char *MAGICK_LDFLAGS; + extern OCTAVE_API const char *MAGICK_LIBS; + extern OCTAVE_API const char *LLVM_CPPFLAGS; + extern OCTAVE_API const char *LLVM_LDFLAGS; + extern OCTAVE_API const char *LLVM_LIBS; + extern OCTAVE_API const char *MKOCTFILE_DL_LDFLAGS; + extern OCTAVE_API const char *OCTAVE_LINK_DEPS; + extern OCTAVE_API const char *OCTAVE_LINK_OPTS; + extern OCTAVE_API const char *OCTINCLUDEDIR; + extern OCTAVE_API const char *OCTLIBDIR; + extern OCTAVE_API const char *OCT_LINK_DEPS; + extern OCTAVE_API const char *OCT_LINK_OPTS; + extern OCTAVE_API const char *OPENGL_LIBS; + extern OCTAVE_API const char *PCRE_CPPFLAGS; + extern OCTAVE_API const char *PCRE_LDFLAGS; + extern OCTAVE_API const char *PCRE_LIBS; + extern OCTAVE_API const char *PREFIX; + extern OCTAVE_API const char *PTHREAD_CFLAGS; + extern OCTAVE_API const char *PTHREAD_LIBS; + extern OCTAVE_API const char *QHULL_CPPFLAGS; + extern OCTAVE_API const char *QHULL_LDFLAGS; + extern OCTAVE_API const char *QHULL_LIBS; + extern OCTAVE_API const char *QRUPDATE_CPPFLAGS; + extern OCTAVE_API const char *QRUPDATE_LDFLAGS; + extern OCTAVE_API const char *QRUPDATE_LIBS; + extern OCTAVE_API const char *QT_CPPFLAGS; + extern OCTAVE_API const char *QT_LDFLAGS; + extern OCTAVE_API const char *QT_LIBS; + extern OCTAVE_API const char *QT_OPENGL_LIBS; + extern OCTAVE_API const char *RANLIB; + extern OCTAVE_API const char *RDYNAMIC_FLAG; + extern OCTAVE_API const char *READLINE_LIBS; + extern OCTAVE_API const char *SHARED_LIBS; + extern OCTAVE_API const char *SH_LDFLAGS; + extern OCTAVE_API const char *STATIC_LIBS; + extern OCTAVE_API const char *SUITESPARSECONFIG_LIBS; + extern OCTAVE_API const char *SUNDIALS_IDA_CPPFLAGS; + extern OCTAVE_API const char *SUNDIALS_IDA_LDFLAGS; + extern OCTAVE_API const char *SUNDIALS_IDA_LIBS; + extern OCTAVE_API const char *SUNDIALS_NVECSERIAL_CPPFLAGS; + extern OCTAVE_API const char *SUNDIALS_NVECSERIAL_LDFLAGS; + extern OCTAVE_API const char *SUNDIALS_NVECSERIAL_LIBS; + extern OCTAVE_API const char *SUNDIALS_SUNLINSOLKLU_CPPFLAGS; + extern OCTAVE_API const char *SUNDIALS_SUNLINSOLKLU_LDFLAGS; + extern OCTAVE_API const char *SUNDIALS_SUNLINSOLKLU_LIBS; + extern OCTAVE_API const char *TERM_LIBS; + extern OCTAVE_API const char *UMFPACK_CPPFLAGS; + extern OCTAVE_API const char *UMFPACK_LDFLAGS; + extern OCTAVE_API const char *UMFPACK_LIBS; + extern OCTAVE_API const char *WARN_CFLAGS; + extern OCTAVE_API const char *WARN_CXXFLAGS; + extern OCTAVE_API const char *X11_INCFLAGS; + extern OCTAVE_API const char *X11_LIBS; + extern OCTAVE_API const char *XTRA_CFLAGS; + extern OCTAVE_API const char *XTRA_CXXFLAGS; + extern OCTAVE_API const char *YACC; + extern OCTAVE_API const char *YFLAGS; + extern OCTAVE_API const char *Z_CPPFLAGS; + extern OCTAVE_API const char *Z_LDFLAGS; + extern OCTAVE_API const char *Z_LIBS; + extern OCTAVE_API const char *config_opts; } } diff -r 497b8c85805a -r 19a51c2f2752 libinterp/corefcn/interpreter-private.h --- a/libinterp/corefcn/interpreter-private.h Wed Dec 16 01:33:57 2020 -0500 +++ b/libinterp/corefcn/interpreter-private.h Tue Dec 22 15:00:44 2020 +0100 @@ -54,45 +54,45 @@ class tree_evaluator; class type_info; - extern interpreter& __get_interpreter__ (const std::string& who); + extern OCTAVE_API interpreter& __get_interpreter__ (const std::string& who); - extern dynamic_loader& __get_dynamic_loader__ (const std::string& who); + extern OCTAVE_API dynamic_loader& __get_dynamic_loader__ (const std::string& who); - extern error_system& __get_error_system__ (const std::string& who); + extern OCTAVE_API error_system& __get_error_system__ (const std::string& who); - extern gh_manager& __get_gh_manager__ (const std::string& who); + extern OCTAVE_API gh_manager& __get_gh_manager__ (const std::string& who); - extern help_system& __get_help_system__ (const std::string& who); + extern OCTAVE_API help_system& __get_help_system__ (const std::string& who); - extern input_system& __get_input_system__ (const std::string& who); + extern OCTAVE_API input_system& __get_input_system__ (const std::string& who); - extern load_path& __get_load_path__ (const std::string& who); + extern OCTAVE_API load_path& __get_load_path__ (const std::string& who); - extern load_save_system& __get_load_save_system__ (const std::string& who); + extern OCTAVE_API load_save_system& __get_load_save_system__ (const std::string& who); - extern event_manager& __get_event_manager__ (const std::string& who); + extern OCTAVE_API event_manager& __get_event_manager__ (const std::string& who); - extern output_system& __get_output_system__ (const std::string& who); + extern OCTAVE_API output_system& __get_output_system__ (const std::string& who); - extern type_info& __get_type_info__ (const std::string& who); + extern OCTAVE_API type_info& __get_type_info__ (const std::string& who); - extern symbol_table& __get_symbol_table__ (const std::string& who); + extern OCTAVE_API symbol_table& __get_symbol_table__ (const std::string& who); - extern symbol_scope __get_current_scope__ (const std::string& who); + extern OCTAVE_API symbol_scope __get_current_scope__ (const std::string& who); - extern symbol_scope __require_current_scope__ (const std::string& who); + extern OCTAVE_API symbol_scope __require_current_scope__ (const std::string& who); - extern tree_evaluator& __get_evaluator__ (const std::string& who); + extern OCTAVE_API tree_evaluator& __get_evaluator__ (const std::string& who); - extern bp_table& __get_bp_table__ (const std::string& who); + extern OCTAVE_API bp_table& __get_bp_table__ (const std::string& who); - extern child_list& __get_child_list__ (const std::string& who); + extern OCTAVE_API child_list& __get_child_list__ (const std::string& who); - extern cdef_manager& __get_cdef_manager__ (const std::string& who); + extern OCTAVE_API cdef_manager& __get_cdef_manager__ (const std::string& who); - extern display_info& __get_display_info__ (const std::string& who); + extern OCTAVE_API display_info& __get_display_info__ (const std::string& who); - extern gtk_manager& __get_gtk_manager__ (const std::string& who); + extern OCTAVE_API gtk_manager& __get_gtk_manager__ (const std::string& who); // Functions that could be methods in the interpreter class but maybe // shouldn't be exposed as part of the public interface. diff -r 497b8c85805a -r 19a51c2f2752 libinterp/octave-value/ov-base.h --- a/libinterp/octave-value/ov-base.h Wed Dec 16 01:33:57 2020 -0500 +++ b/libinterp/octave-value/ov-base.h Tue Dec 22 15:00:44 2020 +0100 @@ -50,7 +50,7 @@ // interpreter-private.h here and bringing in a lot of unnecessary // symbols that require even more header files. - extern type_info& __get_type_info__ (const std::string&); + extern OCTAVE_API type_info& __get_type_info__ (const std::string&); } class Cell; diff -r 497b8c85805a -r 19a51c2f2752 libinterp/octave-value/ov-typeinfo.h --- a/libinterp/octave-value/ov-typeinfo.h Wed Dec 16 01:33:57 2020 -0500 +++ b/libinterp/octave-value/ov-typeinfo.h Tue Dec 22 15:00:44 2020 +0100 @@ -39,7 +39,7 @@ namespace octave { - class type_info + class OCTAVE_API type_info { public: @@ -285,47 +285,48 @@ typedef octave::type_info::assignany_op_fcn assignany_op_fcn; - extern int register_type (const std::string& t_name, - const std::string& c_name, - const octave_value& val); + extern OCTAVE_API int register_type (const std::string& t_name, + const std::string& c_name, + const octave_value& val); - extern octave_value lookup_type (const std::string& nm); + extern OCTAVE_API octave_value lookup_type (const std::string& nm); - extern unary_class_op_fcn lookup_unary_class_op (octave_value::unary_op op); + extern OCTAVE_API unary_class_op_fcn + lookup_unary_class_op (octave_value::unary_op op); - extern unary_op_fcn lookup_unary_op (octave_value::unary_op op, int t); + extern OCTAVE_API unary_op_fcn lookup_unary_op (octave_value::unary_op op, int t); - extern non_const_unary_op_fcn + extern OCTAVE_API non_const_unary_op_fcn lookup_non_const_unary_op (octave_value::unary_op op, int t); - extern binary_class_op_fcn + extern OCTAVE_API binary_class_op_fcn lookup_binary_class_op (octave_value::binary_op op); - extern binary_op_fcn + extern OCTAVE_API binary_op_fcn lookup_binary_op (octave_value::binary_op op, int t1, int t2); - extern binary_class_op_fcn + extern OCTAVE_API binary_class_op_fcn lookup_binary_class_op (octave_value::compound_binary_op op); - extern binary_op_fcn + extern OCTAVE_API binary_op_fcn lookup_binary_op (octave_value::compound_binary_op op, int t1, int t2); - extern cat_op_fcn lookup_cat_op (int t1, int t2); + extern OCTAVE_API cat_op_fcn lookup_cat_op (int t1, int t2); - extern assign_op_fcn + extern OCTAVE_API assign_op_fcn lookup_assign_op (octave_value::assign_op op, int t_lhs, int t_rhs); - extern assignany_op_fcn + extern OCTAVE_API assignany_op_fcn lookup_assignany_op (octave_value::assign_op op, int t_lhs); - extern int lookup_pref_assign_conv (int t_lhs, int t_rhs); + extern OCTAVE_API int lookup_pref_assign_conv (int t_lhs, int t_rhs); - extern octave_base_value::type_conv_fcn + extern OCTAVE_API octave_base_value::type_conv_fcn lookup_widening_op (int t, int t_result); - extern string_vector installed_type_names (void); + extern OCTAVE_API string_vector installed_type_names (void); - extern octave_scalar_map installed_type_info (void); + extern OCTAVE_API octave_scalar_map installed_type_info (void); } #endif