warning: returning reference to temporary

mpictor · mpictor · commit 62e2baa5fd81 · 2013-09-16T21:46:37.000-04:00
diff --git a/src/base/judy/src/judyL2Array.h b/src/base/judy/src/judyL2Array.h
@@ -41,6 +41,7 @@ class judyL2Array {
         vector ** _lastSlot;
         JudyKey _buff[1];
         bool _success;
+        cpair kv;
     public:
         judyL2Array(): _maxLevels( sizeof( JudyKey ) ), _depth( 1 ), _lastSlot( 0 ), _success( true ) {
             assert( sizeof( JudyKey ) == JUDY_key_size && "JudyKey *must* be the same size as a pointer!" );
@@ -159,8 +160,7 @@ class judyL2Array {
         }
 
         /// retrieve the key-value pair for the most recent judy query.
-        inline const cpair mostRecentPair() {
-            cpair kv;
+        inline const cpair & mostRecentPair() {
             judy_key( _judyarray, ( unsigned char * ) _buff, _depth * JUDY_key_size );
             if( _lastSlot ) {
                 kv.value = *_lastSlot;
diff --git a/src/base/judy/src/judyS2Array.h b/src/base/judy/src/judyS2Array.h
@@ -40,6 +40,7 @@ class judyS2Array {
         vector ** _lastSlot;
         unsigned char * _buff;
         bool _success;
+        cpair kv;
     public:
         judyS2Array( unsigned int maxKeyLen ): _maxKeyLen( maxKeyLen ), _lastSlot( 0 ), _success( true ) {
             _judyarray = judy_open( _maxKeyLen, 0 );
@@ -184,8 +185,7 @@ class judyS2Array {
         }
 
         /// retrieve the key-value pair for the most recent judy query.
-        inline const cpair mostRecentPair() {
-            cpair kv;
+        inline const cpair & mostRecentPair() {
             judy_key( _judyarray, _buff, _maxKeyLen );
             if( _lastSlot ) {
                 kv.value = *_lastSlot;
