Skip to content

Patch tkonline to bring pure virtual functions #7003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smuzaffar merged 1 commit into from
Jun 9, 2021
Merged

Patch tkonline to bring pure virtual functions #7003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions tkonlinesw-bring-pvf.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/TrackerOnline/Fed9U/Fed9USoftware/Fed9UUtils/include/Fed9UUtils.hh b/TrackerOnline/Fed9U/Fed9USoftware/Fed9UUtils/include/Fed9UUtils.hh
index ca2f0eb..c7a6b45 100644
--- a/TrackerOnline/Fed9U/Fed9USoftware/Fed9UUtils/include/Fed9UUtils.hh
+++ b/TrackerOnline/Fed9U/Fed9USoftware/Fed9UUtils/include/Fed9UUtils.hh
@@ -4789,7 +4789,8 @@ namespace Fed9U {
*
* \todo check numbering scheme (internal or external).
*/
- virtual u32 getAllApvDisables(const Fed9UAddress&) { ICUTILS_VERIFY(0).msg("Method unimplemented in base class. Implement in derived class").error(); return 0;}
+ virtual u32 getAllApvDisables(const Fed9UAddress&) const = 0;
+ //virtual u32 getAllApvDisables(const Fed9UAddress&) { ICUTILS_VERIFY(0).msg("Method unimplemented in base class. Implement in derived class").error(); return 0;}

/**
* \brief Returns the maximum buffer size that could be required by the Fed9UVmeDevice::getCompleteEvent method.
@@ -4850,7 +4851,8 @@ namespace Fed9U {
* \brief Returns the base of the FED in the crate.
* \return u32 Contains the value of the FED base address.
*/
- virtual u32 getBaseAddress() { ICUTILS_VERIFY(0).msg("Method unimplemented in base class. Implement in derived class").error(); return 0;}
+ virtual u32 getBaseAddress() const = 0;
+ //virtual u32 getBaseAddress() { ICUTILS_VERIFY(0).msg("Method unimplemented in base class. Implement in derived class").error(); return 0;}

/**
* \brief Number of the crate that the FED is located in.
3 changes: 2 additions & 1 deletion tkonlinesw.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Source0: http://cms-trackerdaq-service.web.cern.ch/cms-trackerdaq-service/download/sources/trackerDAQ-%{realversion}.tgz
Patch0: tkonlinesw-2.7.0-macosx
Patch1: tkonlinesw-4.0-clang-hash_map

Patch2: tkonlinesw-bring-pvf
# NOTE: given how broken the standard build system is
# on macosx, it's not worth fixing it.
# The 4 libraries we need can be built with the
Expand All @@ -24,6 +24,7 @@ Requires: root
%prep
%setup -q -n %releasename
%patch1 -p1
%patch2 -p1
case %cmsos in
osx*)
%patch0 -p1
Expand Down