You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2006/06/15 23:40:11 UTC
svn commit: r414690 - /incubator/stdcxx/trunk/include/rw/_specialized.h
Author: sebor
Date: Thu Jun 15 14:40:11 2006
New Revision: 414690
URL: http://svn.apache.org/viewvc?rev=414690&view=rev
Log:
2006-06-15 Martin Sebor <se...@roguewave.com>
STDCXX-203
* _specialized.h (__rw_construct): Added an overload on volatile T*.
Modified:
incubator/stdcxx/trunk/include/rw/_specialized.h
Modified: incubator/stdcxx/trunk/include/rw/_specialized.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/include/rw/_specialized.h?rev=414690&r1=414689&r2=414690&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_specialized.h (original)
+++ incubator/stdcxx/trunk/include/rw/_specialized.h Thu Jun 15 14:40:11 2006
@@ -10,6 +10,25 @@
*
***************************************************************************
*
+ * Copyright 2005-2006 The Apache Software Foundation or its licensors,
+ * as applicable.
+ *
+ * Copyright 2001-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.
+ *
+ ***************************************************************************
+ *
* Copyright (c) 1994
* Hewlett-Packard Company
*
@@ -21,19 +40,6 @@
* representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied warranty.
*
- ***************************************************************************
- *
- * 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.
- *
**************************************************************************/
#ifndef _RWSTD_RW_SPECIALIZED_H_INCLUDED
@@ -70,22 +76,34 @@
#undef _RWSTD_CONTAINER_SIZE_TYPE
-template <class _TypeT>
-inline void __rw_destroy (_TypeT &__ref)
+template <class _TypeT, class _TypeU>
+inline void
+__rw_construct (_TypeT* __p, const _TypeU& __val)
{
- __ref.~_TypeT ();
+ ::new (_RWSTD_STATIC_CAST (void*, __p)) _TypeT (__val);
}
template <class _TypeT, class _TypeU>
-inline void __rw_construct (_TypeT* __p, const _TypeU& __val)
+inline void
+__rw_construct (volatile _TypeT* __p, const _TypeU& __val)
{
- ::new (__p) _TypeT (__val);
+ // remove volatile before invoking operator new
+ __rw_construct (_RWSTD_CONST_CAST (_TypeT*, __p), __val);
+}
+
+
+template <class _TypeT>
+inline void
+__rw_destroy (_TypeT &__ref)
+{
+ __ref.~_TypeT ();
}
template <class _ForwardIterator>
-inline void __rw_destroy (_ForwardIterator __first, _ForwardIterator __last)
+inline void
+__rw_destroy (_ForwardIterator __first, _ForwardIterator __last)
{
for (; __first != __last; ++__first)
__rw_destroy (*__first);
@@ -107,8 +125,8 @@
_RWSTD_NAMESPACE (std) {
-template <class _TypeT> class
-allocator;
+template <class _TypeT>
+class allocator;
// 20.4.4.1