diff options
Diffstat (limited to 'ACE/ace/Tokenizer_T.cpp')
| -rw-r--r-- | ACE/ace/Tokenizer_T.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/ACE/ace/Tokenizer_T.cpp b/ACE/ace/Tokenizer_T.cpp index a0af46e9ec0..d913a92049b 100644 --- a/ACE/ace/Tokenizer_T.cpp +++ b/ACE/ace/Tokenizer_T.cpp @@ -11,8 +11,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <class CHAR> -ACE_Tokenizer_T<CHAR>::ACE_Tokenizer_T (CHAR *buffer) +template <class ACE_CHAR_T> +ACE_Tokenizer_T<ACE_CHAR_T>::ACE_Tokenizer_T (ACE_CHAR_T *buffer) : buffer_ (buffer), index_ (0), preserves_index_ (0), @@ -20,9 +20,9 @@ ACE_Tokenizer_T<CHAR>::ACE_Tokenizer_T (CHAR *buffer) { } -template <class CHAR> +template <class ACE_CHAR_T> int -ACE_Tokenizer_T<CHAR>::delimiter (CHAR d) +ACE_Tokenizer_T<ACE_CHAR_T>::delimiter (ACE_CHAR_T d) { if (delimiter_index_ == MAX_DELIMITERS) return -1; @@ -33,10 +33,10 @@ ACE_Tokenizer_T<CHAR>::delimiter (CHAR d) return 0; } -template <class CHAR> +template <class ACE_CHAR_T> int -ACE_Tokenizer_T<CHAR>::delimiter_replace (CHAR d, - CHAR replacement) +ACE_Tokenizer_T<ACE_CHAR_T>::delimiter_replace (ACE_CHAR_T d, + ACE_CHAR_T replacement) { // Make it possible to replace delimiters on-the-fly, e.g., parse // string until certain token count and then copy rest of the @@ -59,10 +59,10 @@ ACE_Tokenizer_T<CHAR>::delimiter_replace (CHAR d, return 0; } -template <class CHAR> +template <class ACE_CHAR_T> int -ACE_Tokenizer_T<CHAR>::preserve_designators (CHAR start, - CHAR stop, +ACE_Tokenizer_T<ACE_CHAR_T>::preserve_designators (ACE_CHAR_T start, + ACE_CHAR_T stop, int strip) { if (preserves_index_ == MAX_PRESERVES) @@ -75,11 +75,11 @@ ACE_Tokenizer_T<CHAR>::preserve_designators (CHAR start, return 0; } -template <class CHAR> +template <class ACE_CHAR_T> int -ACE_Tokenizer_T<CHAR>::is_delimiter (CHAR d, +ACE_Tokenizer_T<ACE_CHAR_T>::is_delimiter (ACE_CHAR_T d, int &replace, - CHAR &r) + ACE_CHAR_T &r) { replace = 0; @@ -97,10 +97,10 @@ ACE_Tokenizer_T<CHAR>::is_delimiter (CHAR d, return 0; } -template <class CHAR> +template <class ACE_CHAR_T> int -ACE_Tokenizer_T<CHAR>::is_preserve_designator (CHAR start, - CHAR &stop, +ACE_Tokenizer_T<ACE_CHAR_T>::is_preserve_designator (ACE_CHAR_T start, + ACE_CHAR_T &stop, int &strip) { for (int x = 0; x < preserves_index_; x++) @@ -114,9 +114,9 @@ ACE_Tokenizer_T<CHAR>::is_preserve_designator (CHAR start, return 0; } -template <class CHAR> -CHAR * -ACE_Tokenizer_T<CHAR>::next (void) +template <class ACE_CHAR_T> +ACE_CHAR_T * +ACE_Tokenizer_T<ACE_CHAR_T>::next (void) { // Check if the previous pass was the last one in the buffer. if (index_ == -1) @@ -124,16 +124,16 @@ ACE_Tokenizer_T<CHAR>::next (void) index_ = 0; return 0; } - + // Check if a buffer has been passed if (!buffer_) { return 0; } - CHAR replacement = 0; + ACE_CHAR_T replacement = 0; int replace; - CHAR *next_token = 0; + ACE_CHAR_T *next_token = 0; // Skip all leading delimiters. for (;;) @@ -159,7 +159,7 @@ ACE_Tokenizer_T<CHAR>::next (void) next_token = buffer_ + index_; // A preserved region is it's own token. - CHAR stop; + ACE_CHAR_T stop; int strip; if (this->is_preserve_designator (buffer_[index_], stop, |