From 45c7906d41dbfec83ff72deff33490f1a5b25b3d Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Tue, 24 Jul 2018 16:13:52 +0200 Subject: [PATCH] import-trace: cleanup Change-Id: I9f658c1bb9881fd1ef70f1744b6a2e2c36ad7142 --- tools/import-trace/AdvancedMemoryImporter.cc | 2 +- tools/import-trace/InstructionImporter.cc | 2 +- tools/import-trace/RandomJumpImporter.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/import-trace/AdvancedMemoryImporter.cc b/tools/import-trace/AdvancedMemoryImporter.cc index 338b8e75..eb36cd33 100644 --- a/tools/import-trace/AdvancedMemoryImporter.cc +++ b/tools/import-trace/AdvancedMemoryImporter.cc @@ -118,7 +118,7 @@ bool AdvancedMemoryImporter::handle_ip_event(fail::simtime_t curtime, instructio LOG << m_elf->getFilename() << "': " << Buf << ".\n"; return false; } - binary = &(*BinaryOrErr.get().getBinary()); + binary = BinaryOrErr.get().getBinary(); // necessary due to an AspectC++ bug triggered by LLVM 3.3's dyn_cast() #ifndef __puma diff --git a/tools/import-trace/InstructionImporter.cc b/tools/import-trace/InstructionImporter.cc index fd979a26..c0eab477 100644 --- a/tools/import-trace/InstructionImporter.cc +++ b/tools/import-trace/InstructionImporter.cc @@ -32,7 +32,7 @@ bool InstructionImporter::handle_ip_event(fail::simtime_t curtime, instruction_c LOG << m_elf->getFilename() << "': " << Buf << ".\n"; return false; } - binary = &(*BinaryOrErr.get().getBinary()); + binary = BinaryOrErr.get().getBinary(); // necessary due to an AspectC++ bug triggered by LLVM 3.3's dyn_cast() #ifndef __puma diff --git a/tools/import-trace/RandomJumpImporter.cc b/tools/import-trace/RandomJumpImporter.cc index 0f2a788f..d426f12c 100644 --- a/tools/import-trace/RandomJumpImporter.cc +++ b/tools/import-trace/RandomJumpImporter.cc @@ -74,7 +74,7 @@ bool RandomJumpImporter::handle_ip_event(fail::simtime_t curtime, instruction_co LOG << m_elf->getFilename() << "': " << Buf << ".\n"; return false; } - binary = &(*BinaryOrErr.get().getBinary()); + binary = BinaryOrErr.get().getBinary(); // necessary due to an AspectC++ bug triggered by LLVM 3.3's dyn_cast() #ifndef __puma