Derreference of nullptr corrected

UofUEpiBio · Jun 13, 2023 · 5717d37 · 5717d37
1 parent 520a61a
commit 5717d37
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/epiworld.hpp b/epiworld.hpp
@@ -628,9 +628,9 @@ inline int roulette(std::vector< double > & probs, Model<TSeq> * m)
 }
 
 template<typename TSeq>
-inline int roulette(std::vector< epiworld_double > & probs, Model<TSeq> * m)
+inline int roulette(std::vector< float > & probs, Model<TSeq> * m)
 {
-    return roulette<TSeq, epiworld_double>(probs, m);
+    return roulette<TSeq, float>(probs, m);
 }
 
 
@@ -10013,7 +10013,7 @@ class Virus {
     void mutate(Model<TSeq> * model);
     void set_mutation(MutFun<TSeq> fun);
 
-    const TSeq* get_sequence();
+    std::shared_ptr<TSeq> get_sequence();
     void set_sequence(TSeq sequence);
 
     Agent<TSeq> * get_agent();
@@ -10237,10 +10237,10 @@ inline void Virus<TSeq>::set_mutation(
 }
 
 template<typename TSeq>
-inline const TSeq * Virus<TSeq>::get_sequence()
+inline std::shared_ptr<TSeq> Virus<TSeq>::get_sequence()
 {
 
-    return &(*baseline_sequence);
+    return baseline_sequence;
 
 }
 

diff --git a/include/epiworld/misc.hpp b/include/epiworld/misc.hpp
@@ -192,9 +192,9 @@ inline int roulette(std::vector< double > & probs, Model<TSeq> * m)
 }
 
 template<typename TSeq>
-inline int roulette(std::vector< epiworld_double > & probs, Model<TSeq> * m)
+inline int roulette(std::vector< float > & probs, Model<TSeq> * m)
 {
-    return roulette<TSeq, epiworld_double>(probs, m);
+    return roulette<TSeq, float>(probs, m);
 }
 
 

diff --git a/include/epiworld/virus-bones.hpp b/include/epiworld/virus-bones.hpp
@@ -62,7 +62,7 @@ class Virus {
     void mutate(Model<TSeq> * model);
     void set_mutation(MutFun<TSeq> fun);
 
-    const TSeq* get_sequence();
+    std::shared_ptr<TSeq> get_sequence();
     void set_sequence(TSeq sequence);
 
     Agent<TSeq> * get_agent();

diff --git a/include/epiworld/virus-meat.hpp b/include/epiworld/virus-meat.hpp
@@ -109,10 +109,10 @@ inline void Virus<TSeq>::set_mutation(
 }
 
 template<typename TSeq>
-inline const TSeq * Virus<TSeq>::get_sequence()
+inline std::shared_ptr<TSeq> Virus<TSeq>::get_sequence()
 {
 
-    return &(*baseline_sequence);
+    return baseline_sequence;
 
 }
 

diff --git 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