From 215f83f9ec92c701a7d752eb594c2f796ae8052e Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sun, 15 May 2022 00:12:25 -0300 Subject: [PATCH] core, examples: fix rollback mistake with HAVE_SQLITE3 and core build --- examples/stats/wifi-example-sim.cc | 4 ++-- src/core/model/test.cc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/stats/wifi-example-sim.cc b/examples/stats/wifi-example-sim.cc index f2d65769a..fc8a813a6 100644 --- a/examples/stats/wifi-example-sim.cc +++ b/examples/stats/wifi-example-sim.cc @@ -94,7 +94,7 @@ int main (int argc, char *argv[]) { return -1; } - #ifndef STATS_HAS_SQLITE3 + #ifndef HAVE_SQLITE3 if (format == "db") { NS_LOG_ERROR ("sqlite support not compiled in."); return -1; @@ -300,7 +300,7 @@ int main (int argc, char *argv[]) { NS_LOG_INFO ("Creating omnet formatted data output."); output = CreateObject(); } else if (format == "db") { - #ifdef STATS_HAS_SQLITE3 + #ifdef HAVE_SQLITE3 NS_LOG_INFO ("Creating sqlite formatted data output."); output = CreateObject(); #endif diff --git a/src/core/model/test.cc b/src/core/model/test.cc index 8c619855c..ef058e2c2 100644 --- a/src/core/model/test.cc +++ b/src/core/model/test.cc @@ -587,6 +587,7 @@ TestRunnerImpl::GetTopLevelSourceDir (void) const elements.pop_back (); } NS_FATAL_ERROR ("Could not find source directory from self=" << self); + return self; } //