stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r431409 - /incubator/stdcxx/trunk/src/podarray.h
Date Mon, 14 Aug 2006 18:53:47 GMT
Author: sebor
Date: Mon Aug 14 11:53:46 2006
New Revision: 431409

URL: http://svn.apache.org/viewvc?rev=431409&view=rev
Log:
2006-08-14  Martin Sebor  <sebor@roguewave.com>

	STDCXX-276
	* podarray.h (__rw_pod_array): Moved member initialization into
	the body of the ctor in order to prevent HP aCC 3.70 ICE.

Modified:
    incubator/stdcxx/trunk/src/podarray.h

Modified: incubator/stdcxx/trunk/src/podarray.h
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/src/podarray.h?rev=431409&r1=431408&r2=431409&view=diff
==============================================================================
--- incubator/stdcxx/trunk/src/podarray.h (original)
+++ incubator/stdcxx/trunk/src/podarray.h Mon Aug 14 11:53:46 2006
@@ -84,21 +84,38 @@
     }
 
     _EXPLICIT __rw_pod_array (const _TypeT *__a)
-        : _C_len (_STD::char_traits<_TypeT>::length (__a)),
-          _C_pbuf (_C_len < _Size ? _C_buffer : new _TypeT [_C_len + 1]) {
-        memcpy (_C_pbuf, __a, (_C_len + 1) * sizeof *__a);
-    }
+        : _C_len (_STD::char_traits<_TypeT>::length (__a))
+        // , _C_pbuf (_C_len < _Size ? _C_buffer : new _TypeT [_C_len + 1])
+        {
+            // initialze _C_pbuf here in order to prevent HP aCC 3.70
+            // ICE: see http://issues.apache.org/jira/browse/STDCXX-276
+            if (_C_len < _Size)
+                _C_pbuf = _C_buffer;
+            else
+                _C_pbuf = new _TypeT [_C_len + 1];
+            memcpy (_C_pbuf, __a, (_C_len + 1) * sizeof *__a);
+        }
 
     __rw_pod_array (const _TypeT *__a, _SizeT __len)
-        : _C_len (__len),
-          _C_pbuf (_C_len < _Size ? _C_buffer : new _TypeT [__len + 1]) {
+        : _C_len (__len) {
+        // initialze _C_pbuf here in order to prevent HP aCC 3.70
+        // ICE: see http://issues.apache.org/jira/browse/STDCXX-276
+        if (__len < _Size)
+            _C_pbuf = _C_buffer;
+        else
+            _C_pbuf = new _TypeT [__len + 1];
         memcpy (_C_pbuf, __a, __len * sizeof *__a);
         _C_pbuf [_C_len] = _TypeT ();
     }
 
     __rw_pod_array (const __rw_pod_array &__rhs)
-        : _C_len (__rhs._C_len),
-          _C_pbuf (_C_len < _Size ? _C_buffer : new _TypeT [_C_len + 1]) {
+        : _C_len (__rhs._C_len) {
+        // initialze _C_pbuf here in order to prevent HP aCC 3.70
+        // ICE: see http://issues.apache.org/jira/browse/STDCXX-276
+        if (_C_len < _Size)
+            _C_pbuf = _C_buffer;
+        else
+            _C_pbuf = new _TypeT [_C_len + 1];
         memcpy (_C_pbuf, __rhs._C_pbuf,
                 (_C_len + !!__rhs._C_pbuf) * sizeof *_C_pbuf);
     }



Mime
View raw message