diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 1998-01-02 16:41:16 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 1998-01-02 16:41:16 +0000 |
| commit | a070b02ec82bd133c0eccae0637dde108d8fe06e (patch) | |
| tree | 639c866cf1c22349a1bba83573a8ca603f0757eb /ace | |
| parent | 6897782bc9d075f52c722cf590ec5918a1988a18 (diff) | |
| download | ATCD-a070b02ec82bd133c0eccae0637dde108d8fe06e.tar.gz | |
* tests/Env_Value_Test.cpp (main): Changed the definition of the
TEST_THIS macro to be all on one line. While ugly, this helps in
locating the line when ACE_ASSERT fails, since allowing the macro
to have multiple lines skews the line # reported by ACE_ASSERT.
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Env_Value_T.cpp | 2 | ||||
| -rw-r--r-- | ace/Env_Value_T.h | 2 | ||||
| -rw-r--r-- | ace/Env_Value_T.i | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ace/Env_Value_T.cpp b/ace/Env_Value_T.cpp index 758f3203137..6e8410d968f 100644 --- a/ace/Env_Value_T.cpp +++ b/ace/Env_Value_T.cpp @@ -5,8 +5,6 @@ #endif /* __ACE_INLINE__ */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template void ACE_Convert(const char*, char*&); #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate void ACE_Convert (const char*, char*&) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Env_Value_T.h b/ace/Env_Value_T.h index 5a2b88ea434..7af97e76b59 100644 --- a/ace/Env_Value_T.h +++ b/ace/Env_Value_T.h @@ -43,7 +43,7 @@ public: ~ACE_Env_Value (void); // Destroy the value. - operator const T (void) const; + operator T (void); // Returns the value as type T. void open (const char *varname, const T &defval); diff --git a/ace/Env_Value_T.i b/ace/Env_Value_T.i index 31828bfe385..397a5614e0f 100644 --- a/ace/Env_Value_T.i +++ b/ace/Env_Value_T.i @@ -1,7 +1,7 @@ // $Id$ template <class T> ACE_INLINE -ACE_Env_Value<T>::operator const T (void) const +ACE_Env_Value<T>::operator T (void) { return value_; } @@ -21,7 +21,6 @@ ACE_Env_Value<T>::ACE_Env_Value (const char *varname, this->fetch_value (); } - template <class T> ACE_INLINE void ACE_Env_Value<T>::open (const char *varname, const T &defval) @@ -40,6 +39,12 @@ ACE_Env_Value<T>::fetch_value (void) ACE_Convert (env, value_); } +template <class T> ACE_INLINE const char* +ACE_Env_Value<T>::varname (void) const +{ + return varname_; +} + template <class T> ACE_INLINE ACE_Env_Value<T>::~ACE_Env_Value (void) { |