Mercurial > octave

changeset 30340:2d80e308b9e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Wed, 24 Nov 2021 12:01:52 -0500
parents eff73c13fcf3 (current diff) 2e733d9ce10e (diff)
children ecf207896f76
files libinterp/corefcn/file-io.h
diffstat 3 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/etc/module.mk	Wed Nov 24 10:26:19 2021 -0500
+++ b/etc/module.mk	Wed Nov 24 12:01:52 2021 -0500
@@ -10,6 +10,7 @@
   %reldir%/NEWS.3 \
   %reldir%/NEWS.4 \
   %reldir%/NEWS.5 \
+  %reldir%/NEWS.6 \
   %reldir%/PROJECTS \
   %reldir%/gdbinit
 
--- a/libinterp/corefcn/file-io.cc	Wed Nov 24 10:26:19 2021 -0500
+++ b/libinterp/corefcn/file-io.cc	Wed Nov 24 12:01:52 2021 -0500
@@ -3255,9 +3255,8 @@
 
 // Deprecated variables and functions.
 
-// Deprecated in Octave 6.
-void
-mark_for_deletion (const std::string& file)
+// Remove when corresponding global deprecated function is removed.
+void mark_for_deletion_deprecated (const std::string& file)
 {
   octave::interpreter& interp
     = octave::__get_interpreter__ ("mark_for_deletion");
@@ -3265,9 +3264,8 @@
   interp.mark_for_deletion (file);
 }
 
-// Deprecated in Octave 6.
-void
-cleanup_tmp_files (void)
+// Remove when corresponding global deprecated function is removed.
+void cleanup_tmp_files_deprecated (void)
 {
   octave::interpreter& interp
     = octave::__get_interpreter__ ("cleanup_tmp_files");
--- a/libinterp/corefcn/file-io.h	Wed Nov 24 10:26:19 2021 -0500
+++ b/libinterp/corefcn/file-io.h	Wed Nov 24 12:01:52 2021 -0500
@@ -34,9 +34,15 @@
 
 OCTAVE_NAMESPACE_BEGIN
 
-extern OCTINTERP_API void mark_for_deletion (const std::string&);
+// Use this function internally until the function that uses it is
+// removed.  Remove when corresponding global deprecated function is
+// removed.
+extern void mark_for_deletion_deprecated (const std::string&);
 
-extern OCTINTERP_API void cleanup_tmp_files (void);
+// Use this function internally until the function that uses it is
+// removed.  Remove when corresponding global deprecated function is
+// removed.
+extern void cleanup_tmp_files_deprecated (void);
 
 OCTAVE_NAMESPACE_END