From 5cbed4b3ece796dc63e8958342643fc8a3216051 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 13:04:40 +0000
Subject:  Utilisateur : Fcolin       Date : 31/01/01   Heure : 11:18 Archivé
 dans $/Ivy (vss 3)

---
 Ivy/Regexp.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'Ivy')

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
 
-- 
cgit v1.1