stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r648509 - /stdcxx/trunk/include/string.cc
Date Wed, 16 Apr 2008 04:54:21 GMT
Author: sebor
Date: Tue Apr 15 21:54:10 2008
New Revision: 648509

URL: http://svn.apache.org/viewvc?rev=648509&view=rev
Log:
2008-04-15  Martin Sebor  <sebor@roguewave.com>

	STDCXX-832
	* include/string.cc (_C_get_rep): Used two static_casts via void*
	instead of a single reinterpret_cast to prevent HP aCC 6 warning
	#4232: conversion from "wchar_t*" to a more strictly aligned type.

Modified:
    stdcxx/trunk/include/string.cc

Modified: stdcxx/trunk/include/string.cc
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/string.cc?rev=648509&r1=648508&r2=648509&view=diff
==============================================================================
--- stdcxx/trunk/include/string.cc (original)
+++ stdcxx/trunk/include/string.cc Tue Apr 15 21:54:10 2008
@@ -101,10 +101,11 @@
 
     // allocate, initialize the __string_ref, and initialize each character
     _C_string_ref_type* const __ret =
-    _RWSTD_REINTERPRET_CAST (_C_string_ref_type*,
-        _RWSTD_VALUE_ALLOC (_C_value_alloc_type, *this,
-            allocate (__cap + sizeof (_C_string_ref_type) /
-                          sizeof (value_type) + 2)));
+        _RWSTD_STATIC_CAST (_C_string_ref_type*,
+            _RWSTD_STATIC_CAST (void*,
+                _RWSTD_VALUE_ALLOC (_C_value_alloc_type, *this,
+                    allocate (  __cap + sizeof (_C_string_ref_type)
+                              / sizeof (value_type) + 2))));
 
     // avoid copy construction (mutex isn't copy-constructible)
     // _C_ref_alloc_type (*this).construct (__ret, _C_string_ref_type ());



Mime
View raw message