Author: sebor
Date: Fri Feb 24 10:48:03 2006
New Revision: 380779
URL: http://svn.apache.org/viewcvs?rev=380779&view=rev
Log:
2006-02-24 Martin Sebor <[EMAIL PROTECTED]>
* _traits.h (_RWSTD_MEMCPY, et al): Qualified name(s) with the
_RWSTD_C:: prefix. Updated copyright.
Modified:
incubator/stdcxx/trunk/include/rw/_traits.h
Modified: incubator/stdcxx/trunk/include/rw/_traits.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_traits.h?rev=380779&r1=380778&r2=380779&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_traits.h (original)
+++ incubator/stdcxx/trunk/include/rw/_traits.h Fri Feb 24 10:48:03 2006
@@ -9,16 +9,22 @@
*
***************************************************************************
*
- * Copyright (c) 1994-2005 Quovadx, Inc., acting through its Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0. Unless required by
- * applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License
- * for the specific language governing permissions and limitations under
- * the License.
+ * Copyright 2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2006 Rogue Wave Software.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
**************************************************************************/
@@ -80,15 +86,15 @@
# include _RWSTD_CSTRING // for memcmp(), ...
# include _RWSTD_CWCHAR // wmemcmp(), ...
-# define _RWSTD_MEMCPY memcpy
-# define _RWSTD_MEMCMP memcmp
-# define _RWSTD_MEMMOVE memmove
-# define _RWSTD_MEMSET memset
-# define _RWSTD_STRLEN strlen
-# define _RWSTD_MEMCHR memchr
+# define _RWSTD_MEMCPY _RWSTD_C::memcpy
+# define _RWSTD_MEMCMP _RWSTD_C::memcmp
+# define _RWSTD_MEMMOVE _RWSTD_C::memmove
+# define _RWSTD_MEMSET _RWSTD_C::memset
+# define _RWSTD_STRLEN _RWSTD_C::strlen
+# define _RWSTD_MEMCHR _RWSTD_C::memchr
# ifndef _RWSTD_NO_WMEMCPY
-# define _RWSTD_WMEMCPY wmemcpy
+# define _RWSTD_WMEMCPY _RWSTD_C::wmemcpy
# elif !defined (_RWSTD_NO_WCHAR_T)
_RWSTD_NAMESPACE (__rw) {
@@ -118,7 +124,7 @@
# endif // _RWSTD_NO_WMEMCMP
# ifndef _RWSTD_NO_WMEMMOVE
-# define _RWSTD_WMEMMOVE wmemmove
+# define _RWSTD_WMEMMOVE _RWSTD_C::wmemmove
# elif !defined (_RWSTD_NO_WCHAR_T)
_RWSTD_NAMESPACE (__rw) {
@@ -133,7 +139,7 @@
# endif // _RWSTD_NO_WMEMMOVE
# ifndef _RWSTD_NO_WMEMSET
-# define _RWSTD_WMEMSET wmemset
+# define _RWSTD_WMEMSET _RWSTD_C::wmemset
# elif !defined (_RWSTD_NO_WCHAR_T)
_RWSTD_NAMESPACE (__rw) {
@@ -148,7 +154,7 @@
# endif // _RWSTD_NO_WMEMSET
# ifndef _RWSTD_NO_WCSLEN
-# define _RWSTD_WCSLEN wcslen
+# define _RWSTD_WCSLEN _RWSTD_C::wcslen
# elif !defined (_RWSTD_NO_WCHAR_T)
_RWSTD_NAMESPACE (__rw) {
@@ -163,7 +169,7 @@
# endif // _RWSTD_NO_WCSLEN
# ifndef _RWSTD_NO_WMEMCHR
-# define _RWSTD_WMEMCHR wmemchr
+# define _RWSTD_WMEMCHR _RWSTD_C::wmemchr
# elif !defined (_RWSTD_NO_WCHAR_T)
_RWSTD_NAMESPACE (__rw) {
