Mercurial > octave-nkf

changeset 9994:fdc3a43c0be8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid conflict with gnulib defining glob to be rpl_glob
author John W. Eaton <jwe@octave.org>
date Thu, 17 Dec 2009 02:38:33 -0500
parents b22a2f4b34aa
children 5277222b47d1
files liboctave/ChangeLog liboctave/glob-match.cc liboctave/glob-match.h
diffstat 3 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Wed Dec 16 22:11:38 2009 +0100
+++ b/liboctave/ChangeLog	Thu Dec 17 02:38:33 2009 -0500
@@ -1,3 +1,9 @@
+2009-12-17  John W. Eaton  <jwe@octave.org>
+
+	* glob-match.h, glob-match.cc (glob_match::glob_internal):
+	Rename from glob_match::glob and make private.
+	* glob-match.h (glob_match::glob): Forward to glob_internal.
+
 2009-12-15  Jaroslav Hajek  <highegg@gmail.com>
 
 	* Array.cc (Array<T>::index (const idx_vector&)): Fix determining of
--- a/liboctave/glob-match.cc	Wed Dec 16 22:11:38 2009 +0100
+++ b/liboctave/glob-match.cc	Thu Dec 17 02:38:33 2009 -0500
@@ -81,7 +81,7 @@
 }
 
 string_vector
-glob_match::glob (void)
+glob_match::glob_internal (void)
 {
   string_vector retval;
 
--- a/liboctave/glob-match.h	Wed Dec 16 22:11:38 2009 +0100
+++ b/liboctave/glob-match.h	Thu Dec 17 02:38:33 2009 -0500
@@ -71,7 +71,10 @@
 
   Array<bool> match (const string_vector&);
 
-  string_vector glob (void);
+  // We forward to glob_internal here to avoid problems with gnulib's
+  // glob.h defining glob to be rpl_glob.
+
+  string_vector glob (void) { return glob_internal (); }
 
 private:
 
@@ -80,6 +83,8 @@
 
   // Option flags.
   unsigned int flags;
+
+  string_vector glob_internal (void);
 };
 
 #endif