nemiver r811 - in branches/0.5: . src/dbgengine

[dodji svn gnome org]

Author: dodji
Date: Tue May  6 21:29:31 2008
New Revision: 811
URL: http://svn.gnome.org/viewvc/nemiver?rev=811&view=rev

Log:
fix 526863 â Parsing error leaves nemiver in unusable state

merging command line was:
svn merge -r798:799 svn+ssh://svn.gnome.org/svn/nemiver/trunk



Modified:
   branches/0.5/ChangeLog
   branches/0.5/src/dbgengine/nmv-gdbmi-parser.h

Modified: branches/0.5/src/dbgengine/nmv-gdbmi-parser.h
==============================================================================
--- branches/0.5/src/dbgengine/nmv-gdbmi-parser.h	(original)
+++ branches/0.5/src/dbgengine/nmv-gdbmi-parser.h	Tue May  6 21:29:31 2008
@@ -256,7 +256,8 @@
 
     void get_result_content (list<GDBMIResultSafePtr> &a_list) const
     {
-        THROW_IF_FAIL (!empty () && content_type () == RESULT_TYPE) ;
+        if (empty ()) {return;}
+        THROW_IF_FAIL (content_type () == RESULT_TYPE) ;
         list<boost::variant<GDBMIResultSafePtr,GDBMIValueSafePtr> >::const_iterator it;
         for (it= m_content.begin () ; it!= m_content.end () ; ++it) {
             a_list.push_back (boost::get<GDBMIResultSafePtr> (*it)) ;
@@ -265,7 +266,8 @@
 
     void get_value_content (list<GDBMIValueSafePtr> &a_list) const
     {
-        THROW_IF_FAIL (!empty () && content_type () == VALUE_TYPE) ;
+        if (empty ()) {return;}
+        THROW_IF_FAIL (content_type () == VALUE_TYPE) ;
         list<boost::variant<GDBMIResultSafePtr,GDBMIValueSafePtr> >::const_iterator it;
         for (it= m_content.begin () ; it!= m_content.end () ; ++it) {
             a_list.push_back (boost::get<GDBMIValueSafePtr> (*it)) ;