stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r642359 - /stdcxx/trunk/tests/include/23.containers.h
Date Fri, 28 Mar 2008 20:08:00 GMT
Author: sebor
Date: Fri Mar 28 13:07:59 2008
New Revision: 642359

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

	STDCXX-709
	* tests/include/23.containers.h (ContainerTestCaseData): Declared
	member pointers non-const for 6.0 <= HP aCC <= 6.16 to work around
	a compiler bug.
	(ContainerTestCaseData, ~ContainerTestCaseData): Outlined ctor and
	dtor to reduce code bloat.

Modified:
    stdcxx/trunk/tests/include/23.containers.h

Modified: stdcxx/trunk/tests/include/23.containers.h
URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/include/23.containers.h?rev=642359&r1=642358&r2=642359&view=diff
==============================================================================
--- stdcxx/trunk/tests/include/23.containers.h (original)
+++ stdcxx/trunk/tests/include/23.containers.h Fri Mar 28 13:07:59 2008
@@ -259,65 +259,90 @@
     SizeType off2_;
     SizeType ext2_;
 
+#if    !defined (_RWSTD_HP_aCC_MAJOR)  \
+    || 6 == _RWSTD_HP_aCC_MAJOR && 1600 < _RWSTD_HP_aCC_MINOR
+
     const T* str_;   // pointer to the expanded string
     const T* arg_;   // pointer to the expanded argument
     const T* res_;   // pointer to the expanded result
 
+#else   // 6.0 <= HP aCC <= 6.16
+
+    // non-const to work around an HP aCC 6.16 and prior bug
+    // described in STDCXX-802
+    T* str_;
+    T* arg_;
+    T* res_;
+
+#endif   // HP aCC
+
     const ContainerFunc     &func_;
     const ContainerTestCase &tcase_;
 
     // converts the narrow (and possibly) condensed strings to fully
     // expanded wide character arrays that can be used to construct
     // container objects
-    ContainerTestCaseData (const ContainerFunc &func,
-                           const ContainerTestCase &tcase)
-        : func_ (func), tcase_ (tcase) {
-
-        char buf [256];
-
-        strlen_ = sizeof (buf);
-        char* str = rw_expand (buf, tcase.str, tcase.str_len, &strlen_);
-        str_ = T::from_char (str, strlen_);
-        if (str != buf)
-            delete[] str;
-
-        arglen_ = sizeof (buf);
-        str = rw_expand (buf, tcase.arg, tcase.arg_len, &arglen_);
-        arg_ = T::from_char (str, arglen_);
-        if (str != buf)
-            delete[] str;
-
-        reslen_ = sizeof (buf);
-        str = rw_expand (buf, tcase.res, tcase.nres, &reslen_);
-        res_ = T::from_char (str, reslen_);
-        if (str != buf)
-            delete[] str;
-
-        // compute the offset and extent of the container object
-        // representing the controlled sequence and the offset
-        // and extent of the argument of the function call
-        const SizeType argl = tcase_.arg ? arglen_ : strlen_;
-
-        off1_ = SizeType (tcase_.off) < strlen_ ?
-            SizeType (tcase_.off) : strlen_;
-
-        ext1_ = off1_ + tcase_.size < strlen_ ?
-            SizeType (tcase_.size) : strlen_ - off1_;
-
-        off2_ = SizeType (tcase_.off2) < argl ?
-            SizeType (tcase_.off2) : argl;
-
-        ext2_ = off2_ + tcase_.size2 < argl ?
-            SizeType (tcase_.size2) : argl - off2_;
-    }
-
-    ~ContainerTestCaseData () {
-        // clean up dynamically allocated memory
-        delete[] str_;
-        delete[] arg_;
-        delete[] res_;
-    }
+    ContainerTestCaseData (const ContainerFunc&,
+                           const ContainerTestCase&);
+
+    ~ContainerTestCaseData ();
 };
+
+
+template <class T>
+ContainerTestCaseData<T>::
+ContainerTestCaseData (const ContainerFunc     &func,
+                       const ContainerTestCase &tcase)
+    : func_ (func), tcase_ (tcase)
+{
+    char buf [256];
+
+    strlen_ = sizeof (buf);
+    char* str = rw_expand (buf, tcase.str, tcase.str_len, &strlen_);
+    str_ = T::from_char (str, strlen_);
+    if (str != buf)
+        delete[] str;
+
+    arglen_ = sizeof (buf);
+    str = rw_expand (buf, tcase.arg, tcase.arg_len, &arglen_);
+    arg_ = T::from_char (str, arglen_);
+    if (str != buf)
+        delete[] str;
+
+    reslen_ = sizeof (buf);
+    str = rw_expand (buf, tcase.res, tcase.nres, &reslen_);
+    res_ = T::from_char (str, reslen_);
+    if (str != buf)
+        delete[] str;
+
+    // compute the offset and extent of the container object
+    // representing the controlled sequence and the offset
+    // and extent of the argument of the function call
+    const SizeType argl = tcase_.arg ? arglen_ : strlen_;
+
+    off1_ = SizeType (tcase_.off) < strlen_ ?
+        SizeType (tcase_.off) : strlen_;
+
+    ext1_ = off1_ + tcase_.size < strlen_ ?
+        SizeType (tcase_.size) : strlen_ - off1_;
+
+    off2_ = SizeType (tcase_.off2) < argl ?
+        SizeType (tcase_.off2) : argl;
+
+    ext2_ = off2_ + tcase_.size2 < argl ?
+        SizeType (tcase_.size2) : argl - off2_;
+}
+
+
+template <class T>
+ContainerTestCaseData<T>::
+~ContainerTestCaseData ()
+{
+    // clean up dynamically allocated memory
+    delete[] str_;
+    delete[] arg_;
+    delete[] res_;
+}
 
 /**************************************************************************/
 



Mime
View raw message