Author: sebor
Date: Tue May 16 19:10:56 2006
New Revision: 407122
URL: http://svn.apache.org/viewcvs?rev=407122&view=rev
Log:
2006-05-16 Martin Sebor <[EMAIL PROTECTED]>
* rw_char.h (rw_get_call_counters): Inlined.
Adjusted the formatting of function declarations according
to convention (with function name in column 1).
Modified:
incubator/stdcxx/trunk/tests/include/rw_char.h
Modified: incubator/stdcxx/trunk/tests/include/rw_char.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/include/rw_char.h?rev=407122&r1=407121&r2=407122&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/include/rw_char.h (original)
+++ incubator/stdcxx/trunk/tests/include/rw_char.h Tue May 16 19:10:56 2006
@@ -380,10 +380,10 @@
// of dst to NUL (i.e., such a call is the equivalent of calling
// memset(dst, 0, len * sizeof *dst))
// returns dst
-_TEST_EXPORT
-char* rw_widen (char* /* dst */,
- const char* /* src */,
- _RWSTD_SIZE_T /* len */ = _RWSTD_SIZE_MAX);
+_TEST_EXPORT char*
+rw_widen (char* /* dst */,
+ const char* /* src */,
+ _RWSTD_SIZE_T /* len */ = _RWSTD_SIZE_MAX);
// rw_expand() interprets string src as a sequence of directives and
// widens the result of their processing into the provided buffer dst
@@ -397,19 +397,19 @@
// produced characters not counting the terminating NUL
// the function returns the dynamically allocated buffer; the caller
// must deallocate the buffer using the delete expression
-_TEST_EXPORT
-char* rw_expand (char* /* dst */,
- const char* /* src */,
- _RWSTD_SIZE_T /* src_len */ = _RWSTD_SIZE_MAX,
- _RWSTD_SIZE_T* /* dst_len */ = 0);
+_TEST_EXPORT char*
+rw_expand (char* /* dst */,
+ const char* /* src */,
+ _RWSTD_SIZE_T /* src_len */ = _RWSTD_SIZE_MAX,
+ _RWSTD_SIZE_T* /* dst_len */ = 0);
// rw_narrow() narrows successive elements of src into the buffer dst
// (see rw_widen() for details)
-_TEST_EXPORT
-char* rw_narrow (char* /* dst */,
- const char* /* src */,
- _RWSTD_SIZE_T /* len */ = _RWSTD_SIZE_MAX);
+_TEST_EXPORT char*
+rw_narrow (char* /* dst */,
+ const char* /* src */,
+ _RWSTD_SIZE_T /* len */ = _RWSTD_SIZE_MAX);
// rw_match() compares up to len successive elements of s1 and s2 for
// equality until it finds a pair that do not compare equal or until
@@ -417,59 +417,62 @@
// if (len == SIZE_MAX) is true elements are compared until the first
// mismatch is found or until the NUL character is encountered
// returns the number of matching elements
-_TEST_EXPORT
-_RWSTD_SIZE_T rw_match (const char* /* s1 */,
- const char* /* s2 */,
- _RWSTD_SIZE_T /* len */ = _RWSTD_SIZE_MAX);
+_TEST_EXPORT _RWSTD_SIZE_T
+rw_match (const char* /* s1 */,
+ const char* /* s2 */,
+ _RWSTD_SIZE_T /* len */ = _RWSTD_SIZE_MAX);
#ifndef _RWSTD_WCHAR_T
-_TEST_EXPORT
-wchar_t* rw_widen (wchar_t*, const char*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+_TEST_EXPORT wchar_t*
+rw_widen (wchar_t*, const char*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
-_TEST_EXPORT
-wchar_t* rw_expand (wchar_t* /* dst */,
- const char* /* src */,
- _RWSTD_SIZE_T /* src_len */ = _RWSTD_SIZE_MAX,
- _RWSTD_SIZE_T* /* dst_len */ = 0);
-
-_TEST_EXPORT
-char* rw_narrow (char*, const wchar_t*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
-
-_TEST_EXPORT
-_RWSTD_SIZE_T rw_match (const char*, const wchar_t*,
- _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+_TEST_EXPORT wchar_t*
+rw_expand (wchar_t* /* dst */,
+ const char* /* src */,
+ _RWSTD_SIZE_T /* src_len */ = _RWSTD_SIZE_MAX,
+ _RWSTD_SIZE_T* /* dst_len */ = 0);
+
+_TEST_EXPORT char*
+rw_narrow (char*, const wchar_t*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+
+_TEST_EXPORT _RWSTD_SIZE_T
+rw_match (const char*, const wchar_t*,
+ _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
#endif // _RWSTD_WCHAR_T
-_TEST_EXPORT
-UserChar* rw_widen (UserChar*, const char*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+_TEST_EXPORT UserChar*
+rw_widen (UserChar*, const char*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
-_TEST_EXPORT
-UserChar* rw_expand (UserChar* /* dst */,
- const char* /* src */,
- _RWSTD_SIZE_T /* src_len */ = _RWSTD_SIZE_MAX,
- _RWSTD_SIZE_T* /* dst_len */ = 0);
-
-_TEST_EXPORT
-char* rw_narrow (char*, const UserChar*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
-
-_TEST_EXPORT
-_RWSTD_SIZE_T rw_match (const char*, const UserChar*,
- _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+_TEST_EXPORT UserChar*
+rw_expand (UserChar* /* dst */,
+ const char* /* src */,
+ _RWSTD_SIZE_T /* src_len */ = _RWSTD_SIZE_MAX,
+ _RWSTD_SIZE_T* /* dst_len */ = 0);
-// accessors to n_calls array, if it presents
+_TEST_EXPORT char*
+rw_narrow (char*, const UserChar*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+
+_TEST_EXPORT _RWSTD_SIZE_T
+rw_match (const char*, const UserChar*, _RWSTD_SIZE_T = _RWSTD_SIZE_MAX);
+
+
+// accessors to n_calls array, if present
template <class charT>
-_RWSTD_SIZE_T* rw_get_call_counters (std::char_traits<charT>*, charT*)
+inline _RWSTD_SIZE_T*
+rw_get_call_counters (std::char_traits<charT>*, charT*)
{
return 0;
}
template <class charT>
-_RWSTD_SIZE_T* rw_get_call_counters (UserTraits<charT>*, charT*)
+inline _RWSTD_SIZE_T*
+rw_get_call_counters (UserTraits<charT>*, charT*)
{
return UserTraits<charT>::n_calls_;
}
+
static const struct UserCharFmatInit {
UserCharFmatInit ();
