summaryrefslogtreecommitdiff
path: root/Ivy
diff options
context:
space:
mode:
Diffstat (limited to 'Ivy')
-rw-r--r--Ivy/Regexp.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/Ivy/Regexp.h b/Ivy/Regexp.h
index 3265561..cf7a748 100644
--- a/Ivy/Regexp.h
+++ b/Ivy/Regexp.h
@@ -1,6 +1,4 @@
-#ifndef __REGEXP_H__
-#define __REGEXP_H__
-
+#pragma once
class regexp;
@@ -18,13 +16,13 @@ public:
bool Match( const char * s );
int SubStrings() const;
- const String operator[]( unsigned int i ) const;
+ const string operator[]( unsigned int i ) const;
int SubStart( unsigned int i ) const;
int SubLength( unsigned int i ) const;
- String GetReplaceString( const char * source ) const;
+ string GetReplaceString( const char * source ) const;
- String GetErrorString() const;
+ string GetErrorString() const;
bool CompiledOK() const;
#if defined( _RE_DEBUG )
@@ -32,7 +30,7 @@ public:
#endif
private:
const char * str; /* used to return substring offsets only */
- mutable String m_szError;
+ mutable string m_szError;
regexp * rc;
void ClearErrorString() const;
@@ -40,5 +38,4 @@ private:
};
-#endif