Mercurial > hg > octave-lojdl
changeset 16942:99122191d3dd
maint: Rename regexp.h to lo-regexp.h, regexp.cc to lo-regexp.cc in liboctave.
Remove namespace hit with regexp.cc in libinterp/corefcn.
* liboctave/util/lo-regexp.cc: Renamed from regexp.cc.
* liboctave/util/lo-regexp.h: Renamed from regexp.h.
* liboctave/util/module.mk: Add files to build system.
* libinterp/corefcn/regexp.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/variables.cc: Update #include stmts to new name.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 09 Jul 2013 16:47:57 -0700 |
| parents | 06897f865f0b |
| children | e6ddaa65a777 |
| files | libinterp/corefcn/regexp.cc libinterp/corefcn/symtab.h libinterp/corefcn/variables.cc liboctave/util/lo-regexp.cc liboctave/util/lo-regexp.h liboctave/util/module.mk liboctave/util/regexp.cc liboctave/util/regexp.h |
| diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/regexp.cc +++ b/libinterp/corefcn/regexp.cc @@ -33,7 +33,7 @@ #include "base-list.h" #include "oct-locbuf.h" #include "quit.h" -#include "regexp.h" +#include "lo-regexp.h" #include "str-vec.h" #include "defun.h"
--- a/libinterp/corefcn/symtab.h +++ b/libinterp/corefcn/symtab.h @@ -31,7 +31,7 @@ #include <string> #include "glob-match.h" -#include "regexp.h" +#include "lo-regexp.h" class tree_argument_list; class octave_user_function;
--- a/libinterp/corefcn/variables.cc +++ b/libinterp/corefcn/variables.cc @@ -36,7 +36,7 @@ #include "oct-env.h" #include "file-ops.h" #include "glob-match.h" -#include "regexp.h" +#include "lo-regexp.h" #include "str-vec.h" #include <defaults.h>
rename from liboctave/util/regexp.cc rename to liboctave/util/lo-regexp.cc --- a/liboctave/util/regexp.cc +++ b/liboctave/util/lo-regexp.cc @@ -42,7 +42,7 @@ #include "lo-error.h" #include "oct-locbuf.h" #include "quit.h" -#include "regexp.h" +#include "lo-regexp.h" #include "str-vec.h" // Define the maximum number of retries for a pattern that possibly
rename from liboctave/util/regexp.h rename to liboctave/util/lo-regexp.h --- a/liboctave/util/regexp.h +++ b/liboctave/util/lo-regexp.h @@ -21,8 +21,8 @@ */ -#if !defined (octave_regexp_match_h) -#define octave_regexp_match_h 1 +#if !defined (octave_liboctave_regexp_match_h) +#define octave_liboctave_regexp_match_h 1 #include <list> #include <sstream>
--- a/liboctave/util/module.mk +++ b/liboctave/util/module.mk @@ -34,7 +34,7 @@ util/oct-sort.h \ util/oct-sparse.h \ util/pathsearch.h \ - util/regexp.h \ + util/lo-regexp.h \ util/singleton-cleanup.h \ util/sparse-sort.h \ util/sparse-util.h \ @@ -66,7 +66,7 @@ util/oct-mutex.cc \ util/oct-shlib.cc \ util/pathsearch.cc \ - util/regexp.cc \ + util/lo-regexp.cc \ util/singleton-cleanup.cc \ util/sparse-sort.cc \ util/sparse-util.cc \