Skip to content

Commit bf835ac

Browse files
committed
Add missing attribute for docs devtool
Add missing headers Fix minor compilation errors & warnings w/ MSVC
1 parent 2cc15b4 commit bf835ac

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

include/definitions.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ void TimeSeries<T>::insert(std::size_t step, double time, T &input) {
338338
_timestamp.push_back(time);
339339
_data.push_back(vec);
340340
} else {
341-
int index = std::distance(_step.begin(), it);
341+
std::size_t index = std::distance(_step.begin(), it);
342342
_timestamp[index] = time;
343343
_data[index] = vec;
344344
}

scripts/devtasks.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ def __init__(self, args, config_args=None, build_args=None):
320320
args.with_asan = False
321321
args.build_type = 'Debug'
322322
args.dont_build = False
323+
args.only_python = False
323324
if config_args is None:
324325
config_args = []
325326
if build_args is None:

src/Variables.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#include <cstdlib>
2+
#include <string>
3+
#include <stdexcept>
24
#include "Variables.hpp"
35
#include "modules/CM.hpp"
46
#include "modules/BF.hpp"
@@ -305,9 +307,9 @@ void Variables::readParam(const std::string& fname,
305307
if (fname.empty())
306308
return;
307309
std::cout << "PARAMETER FILE PROVIDED: " << fname << std::endl;
308-
#define convD(x) static_cast<double>(stof(x, nullptr))
309-
#define convI(x) stoi(x, nullptr)
310-
#define convB(x) ((bool)(stoi(x, nullptr)))
310+
#define convD(x) static_cast<double>(std::stof(x, nullptr))
311+
#define convI(x) std::stoi(x, nullptr)
312+
#define convB(x) ((bool)(std::stoi(x, nullptr)))
311313
#define setInputVar(dst, x, dummy) this-> dst = x
312314
#define setModVar(dst, x, mod) modules::mod::set ## dst(x)
313315
#define assign(src, dst, set, conv, ...) \
@@ -405,8 +407,8 @@ void Variables::readGRN(const std::string& fname) {
405407
} else if (i == 36) {
406408
modules::BF::setcNADPHsyn(iVfactor);
407409
} else {
408-
throw std::runtime_error("More GlymaIDs than expected "
409-
" (expected <= 37, provided "
410+
throw std::runtime_error(std::string("More GlymaIDs than expected "
411+
" (expected <= 37, provided ")
410412
+ std::to_string(glymaID_order.size())
411413
+ ")");
412414
}

0 commit comments

Comments
 (0)