gcc 5.4.0 build fixes

dyninst · Oct 17, 2017 · 21fca9d · 21fca9d
1 parent 0974966
commit 21fca9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/symtabAPI/src/Type-mem.h b/symtabAPI/src/Type-mem.h
@@ -33,6 +33,7 @@
 
 #include "symtabAPI/h/Type.h"
 #include "boost/static_assert.hpp"
+#include <pair>
 
 namespace Dyninst {
   namespace SymtabAPI {
@@ -76,9 +77,9 @@ T* typeCollection::addOrUpdateType(T *type)
 	{
 		if ( type->getName() != "" ) 
 		{
-			typesByName.insert(name_accessor, make_pair(type->getName(), type));
+			typesByName.insert(name_accessor, std::make_pair(type->getName(), type));
 		}
-		typesByID.insert(id_accessor, make_pair(type->getID(), type));
+		typesByID.insert(id_accessor, std::make_pair(type->getID(), type));
 		type->incrRefCount();
 		return type;
 	}
@@ -119,7 +120,7 @@ T* typeCollection::addOrUpdateType(T *type)
 		} 
 		else 
 		{
-			typesByName.insert(a, make_pair(existingType->getName(), existingType));
+			typesByName.insert(a, std::make_pair(existingType->getName(), existingType));
 			existingType->incrRefCount();
 		}
 	}

diff --git a/symtabAPI/src/dwarfWalker.C b/symtabAPI/src/dwarfWalker.C
@@ -145,12 +145,12 @@ bool DwarfWalker::parse() {
         bool ret = parseModule(false, fixUnknownMod);
         pop();
         if(!ret) {
-            cilk_sync;
+//            cilk_sync;
             return false;
         }
         compile_offset = next_cu_header;
     }
-    cilk_sync;
+//    cilk_sync;
     /* Iterate over the compilation-unit headers for .debug_info. */
     for(Dwarf_Off cu_off = 0;
             dwarf_nextcu(dbg(), cu_off, &next_cu_header, &cu_header_length,
@@ -167,12 +167,12 @@ bool DwarfWalker::parse() {
         bool ret = parseModule(true, fixUnknownMod);
         pop();
         if(!ret) {
-            cilk_sync;
+//            cilk_sync;
             return false;
         }
         compile_offset = next_cu_header;
     }
-    cilk_sync;
+//    cilk_sync;
     if (!fixUnknownMod)
         return true;
 
@@ -2506,7 +2506,7 @@ void DwarfParseActions::clearFunc() {
 
 typeId_t DwarfWalker::get_type_id(Dwarf_Off offset, bool is_info)
 {
-    static std::atomic<typeId_t> next_type_id = 0;
+    static std::atomic<typeId_t> next_type_id(0);
   auto& type_ids = is_info ? info_type_ids_ : types_type_ids_;
   auto it = type_ids.find(offset);
   if (it != type_ids.end())