From f3f0f4d630498f8f572d60fade4876701604cd2d Mon Sep 17 00:00:00 2001 From: daniel-k Date: Thu, 21 Dec 2017 21:19:52 +0100 Subject: [PATCH] lib/ip: pass ip core by reference to factory instead of unique_ptr --- fpga/include/villas/fpga/ip.hpp | 2 +- fpga/lib/ip.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fpga/include/villas/fpga/ip.hpp b/fpga/include/villas/fpga/ip.hpp index 33f78a904..8912c3190 100644 --- a/fpga/include/villas/fpga/ip.hpp +++ b/fpga/include/villas/fpga/ip.hpp @@ -134,7 +134,7 @@ private: virtual IpCore* create() = 0; /// Configure IP instance from JSON config - virtual bool configureJson(const std::unique_ptr& ip, json_t *json) + virtual bool configureJson(IpCore& ip, json_t *json) { return true; } virtual Vlnv getCompatibleVlnv() const = 0; diff --git a/fpga/lib/ip.cpp b/fpga/lib/ip.cpp index 6fef6270e..6e5e4cb51 100644 --- a/fpga/lib/ip.cpp +++ b/fpga/lib/ip.cpp @@ -263,7 +263,7 @@ IpCoreFactory::make(PCIeCard* card, json_t *json_ips) } // IP-specific setup via JSON config - ipCoreFactory->configureJson(ip, json_ip); + ipCoreFactory->configureJson(*ip, json_ip); // TODO: currently fails, fix and remove comment // if(not ip->start()) {