From 5717d373e209a78d1a53077738058699541392e1 Mon Sep 17 00:00:00 2001 From: "George G. Vega Yon" Date: Tue, 13 Jun 2023 13:39:52 -0600 Subject: [PATCH] Derreference of nullptr corrected --- epiworld.hpp | 10 +++++----- include/epiworld/misc.hpp | 4 ++-- include/epiworld/virus-bones.hpp | 2 +- include/epiworld/virus-meat.hpp | 4 ++-- tests/Makefile | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/epiworld.hpp b/epiworld.hpp index 26ddadea..9385975a 100644 --- a/epiworld.hpp +++ b/epiworld.hpp @@ -628,9 +628,9 @@ inline int roulette(std::vector< double > & probs, Model * m) } template -inline int roulette(std::vector< epiworld_double > & probs, Model * m) +inline int roulette(std::vector< float > & probs, Model * m) { - return roulette(probs, m); + return roulette(probs, m); } @@ -10013,7 +10013,7 @@ class Virus { void mutate(Model * model); void set_mutation(MutFun fun); - const TSeq* get_sequence(); + std::shared_ptr get_sequence(); void set_sequence(TSeq sequence); Agent * get_agent(); @@ -10237,10 +10237,10 @@ inline void Virus::set_mutation( } template -inline const TSeq * Virus::get_sequence() +inline std::shared_ptr Virus::get_sequence() { - return &(*baseline_sequence); + return baseline_sequence; } diff --git a/include/epiworld/misc.hpp b/include/epiworld/misc.hpp index 97400e8c..dbeb73d1 100644 --- a/include/epiworld/misc.hpp +++ b/include/epiworld/misc.hpp @@ -192,9 +192,9 @@ inline int roulette(std::vector< double > & probs, Model * m) } template -inline int roulette(std::vector< epiworld_double > & probs, Model * m) +inline int roulette(std::vector< float > & probs, Model * m) { - return roulette(probs, m); + return roulette(probs, m); } diff --git a/include/epiworld/virus-bones.hpp b/include/epiworld/virus-bones.hpp index d91d4cb2..98e899af 100644 --- a/include/epiworld/virus-bones.hpp +++ b/include/epiworld/virus-bones.hpp @@ -62,7 +62,7 @@ class Virus { void mutate(Model * model); void set_mutation(MutFun fun); - const TSeq* get_sequence(); + std::shared_ptr get_sequence(); void set_sequence(TSeq sequence); Agent * get_agent(); diff --git a/include/epiworld/virus-meat.hpp b/include/epiworld/virus-meat.hpp index d8c190d7..b6d5aa9e 100644 --- a/include/epiworld/virus-meat.hpp +++ b/include/epiworld/virus-meat.hpp @@ -109,10 +109,10 @@ inline void Virus::set_mutation( } template -inline const TSeq * Virus::get_sequence() +inline std::shared_ptr Virus::get_sequence() { - return &(*baseline_sequence); + return baseline_sequence; } diff --git a/tests/Makefile b/tests/Makefile index e20d8975..380bd635 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,7 +1,7 @@ all: main.o main.o: main.cpp - g++ -std=c++14 -Wall -Wextra -O2 -fopenmp -g -pedantic main.cpp -o main.o + g++ -std=c++14 -Wall -Wextra -Wnull-dereference -fdelete-null-pointer-checks -O2 -fopenmp -g -pedantic main.cpp -o main.o main.a: main.cpp clang++ -std=c++14 -Wall -Wextra -fopenmp -Wpedantic -O2 main.cpp -o main.a