Mercurial > hg > octave-nkf

diff liboctave/glob-match.h @ 10148:deba43069023

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't install oct-glob.h
author John W. Eaton <jwe@octave.org>
date Wed, 20 Jan 2010 13:03:10 -0500
parents 93c74edcc3e3
children 4c0cdbe0acca
line wrap: on
line diff
--- a/liboctave/glob-match.h
+++ b/liboctave/glob-match.h
@@ -26,7 +26,6 @@
 #include <string>
 
 #include "Array.h"
-#include "oct-glob.h"
 #include "str-vec.h"
 
 class
@@ -69,12 +68,9 @@
 
   void set_pattern (const string_vector& p) { pat = p; }
 
-  bool match (const std::string& str)
-  {
-    return octave_fnmatch (pat, str, fnmatch_flags);
-  }
+  bool match (const std::string& str) const;
 
-  Array<bool> match (const string_vector& str)
+  Array<bool> match (const string_vector& str) const
   {
     int n = str.length ();
 
@@ -89,7 +85,7 @@
   // 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 octave_glob (pat); }
+  string_vector glob (void) const;
 
 private: