From 5d99f11a3480573765ba7e3e76e03371dcef7dfc Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Tue, 13 Feb 2018 19:56:29 +0100 Subject: [PATCH] lib/ip: move definition of getBaseAddr() back to header This is a one-liner, so IMO increases readability. --- fpga/include/villas/fpga/ip.hpp | 3 ++- fpga/lib/ip.cpp | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/fpga/include/villas/fpga/ip.hpp b/fpga/include/villas/fpga/ip.hpp index b708ed1e4..e41cc1652 100644 --- a/fpga/include/villas/fpga/ip.hpp +++ b/fpga/include/villas/fpga/ip.hpp @@ -177,7 +177,8 @@ public: protected: uintptr_t - getBaseAddr(const std::string& block) const; + getBaseAddr(const std::string& block) const + { return getLocalAddr(block, 0); } uintptr_t getLocalAddr(const std::string& block, uintptr_t address) const; diff --git a/fpga/lib/ip.cpp b/fpga/lib/ip.cpp index 7b93320a8..375739a6e 100644 --- a/fpga/lib/ip.cpp +++ b/fpga/lib/ip.cpp @@ -328,13 +328,6 @@ IpCoreFactory::lookup(const Vlnv &vlnv) } -uintptr_t -IpCore::getBaseAddr(const std::string& block) const -{ - return getLocalAddr(block, 0); -} - - uintptr_t IpCore::getLocalAddr(const std::string& block, uintptr_t address) const {