Skip to content

Commit 4514baf

Browse files
authored
Merge pull request #397 from sy-c/master
compiler fixes
2 parents 9cf9a7c + 3e3df1f commit 4514baf

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

src/CommandLineUtilities/Options.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#ifndef O2_READOUTCARD_CLI_OPTIONS_H
2020
#define O2_READOUTCARD_CLI_OPTIONS_H
2121

22+
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
2223
#include <boost/program_options.hpp>
2324
#include "ReadoutCard/Exception.h"
2425
#include "ReadoutCard/Parameters.h"

src/CommandLineUtilities/ProgramDmaBench.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,8 +1151,8 @@ class ProgramDmaBench : public Program
11511151
static constexpr int NEXT_PAUSE_MAX = 2000; ///< Maximum random pause interval in milliseconds
11521152
static constexpr int PAUSE_LENGTH_MIN = 1; ///< Minimum random pause in milliseconds
11531153
static constexpr int PAUSE_LENGTH_MAX = 500; ///< Maximum random pause in milliseconds
1154-
TimePoint next; ///< Next pause at this time
1155-
std::chrono::milliseconds length; ///< Next pause has this length
1154+
TimePoint next = TimePoint::min(); ///< Next pause at this time
1155+
std::chrono::milliseconds length{PAUSE_LENGTH_MIN}; ///< Next pause has this length
11561156

11571157
void pauseIfNeeded()
11581158
{

src/Cru/CruBar.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ Cru::PacketMonitoringInfo CruBar::monitorPackets()
576576
uint32_t accepted = datapathWrapper.getAcceptedPackets(runStatsLink);
577577
uint32_t rejected = datapathWrapper.getRejectedPackets(runStatsLink);
578578
uint32_t forced = datapathWrapper.getForcedPackets(runStatsLink);
579-
linkPacketInfoMap.insert({ runStatsLink.dwrapperId, { accepted, rejected, forced } });
579+
linkPacketInfoMap.insert({ (int)runStatsLink.dwrapperId, { accepted, rejected, forced } });
580580

581581
// Insert the UL link at 15
582582
Link uLLink = {};

src/ExceptionInternal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <stdexcept>
2121
#include <string>
2222
#include <vector>
23+
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
2324
#include <boost/exception/all.hpp>
2425
#include <cstdint>
2526
#include "Common/Exception.h"

src/PythonInterface.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <iostream>
1818
#include <string>
19+
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
1920
#include <boost/lexical_cast/try_lexical_convert.hpp>
2021
#include <boost/python.hpp>
2122
#include "Common/GuardFunction.h"

0 commit comments

Comments
 (0)