Cleaner way of handling first push_back in directory_table.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 67bb22a7df0a48630bd644cbc049f798dcc9ebfb..b092a4056f793cbb833a743a56b0ae7353f57c2b 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-20  Mark Wielaard  <mjw@redhat.com>
+
+       * c++/dwarf_data (dwarf_data::directory_table::directory_table):
+       Cleaner way of handling first push_back.
+
 2010-08-19  Mark Wielaard  <mjw@redhat.com>
 
        * c++/dwarf_data (dwarf_data::directory_table::directory_table):

diff --git a/libdw/c++/dwarf_data b/libdw/c++/dwarf_data
index 4de17d2daeba2eb737fe351ee39ec9ae10a94480..2cc548bdefb2f1b675055020c3d78350ff313a88 100644 (file)
--- a/libdw/c++/dwarf_data
+++ b/libdw/c++/dwarf_data
@@ -316,7 +316,7 @@ namespace elfutils
           This is not encoded in the .debug_line table, but in
           the DW_AT_comp_dir attribute of the referring CU.  */
        typename table::const_iterator first = other.begin ();
-       _base::push_back (*first != NULL ? std::string (*first) : "");
+       _base::push_back (*first ?: "");
        _base::insert (_base::end (), ++first, other.end ());
       }