You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/06/27 00:31:49 UTC

svn commit: r788893 - /qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp

Author: shuston
Date: Fri Jun 26 22:31:49 2009
New Revision: 788893

URL: http://svn.apache.org/viewvc?rev=788893&view=rev
Log:
In isInline() don't try to take address of a vector w/o storage yet; fixes QPID-1960

Modified:
    qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp

Modified: qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp?rev=788893&r1=788892&r2=788893&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/InlineVector.cpp Fri Jun 26 22:31:49 2009
@@ -30,6 +30,10 @@
 typedef InlineVector<int, 3> Vec;
 
 bool isInline(const Vec& v) {
+    // If nothing, give it the benefit of the doubt;
+    // can't take address of nothing.
+    if (v.size() <= 0)
+        return true;
     return (const char*)&v <= (const char*)(&v[0]) &&
         (const char*)(&v[0]) < (const char*)&v+sizeof(v);
 }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org