From b5a51ec329d05cdf0f87d414ed09bf797f9d7218 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 3 Aug 2021 20:25:18 -0400 Subject: [PATCH] bad bug in tree class fixed, working on mac trying to get the mac builds a bit quieter. new fortune. bug in tree was supposed to be a compare of node to null, but was an assignment! ack. --- infobase/fortunes.dat | 5 ++++- nucleus/library/loggers/program_wide_logger.h | 4 ++-- nucleus/library/nodes/tree.cpp | 2 +- scripts/clam/cpp/variables.def | 6 +++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat index c130710a..735c4809 100644 --- a/infobase/fortunes.dat +++ b/infobase/fortunes.dat @@ -43941,4 +43941,7 @@ will be able to eradicate obscurations from our mind forever and enjoy the sky-like spaciousness of a purified mind. -- Thubten Chodron, from "Awaken Every Day: 365 Buddhist Reflections to Invite Mindfulness and Joy", Shambhala Publications - +~ +i buy all my hats +at interdimensional +pancake restaurant diff --git a/nucleus/library/loggers/program_wide_logger.h b/nucleus/library/loggers/program_wide_logger.h index 70280742..bb73a748 100644 --- a/nucleus/library/loggers/program_wide_logger.h +++ b/nucleus/library/loggers/program_wide_logger.h @@ -72,8 +72,8 @@ class null_logger : public virtual standard_log_base public: virtual ~null_logger() {} DEFINE_CLASS_NAME("null_logger"); - virtual basis::outcome log(const basis::base_string &info, int filter) { - if (filter || !(&info)) {} + virtual basis::outcome log(const basis::base_string &formal(info), int formal(filter)) { + /* if (filter || !(&info)) {} */ return basis::common::OKAY; } }; diff --git a/nucleus/library/nodes/tree.cpp b/nucleus/library/nodes/tree.cpp index 59ca5d70..2a88061c 100644 --- a/nucleus/library/nodes/tree.cpp +++ b/nucleus/library/nodes/tree.cpp @@ -306,7 +306,7 @@ tree::~tree() // or there are no kids at all. curr_node = curr_node->branch(0); - if (curr_node = NULL_POINTER) { + if (curr_node == NULL_POINTER) { // wayback has no children, so we can take action. // if wayback is the same as "this", then we exit from iterations since diff --git a/scripts/clam/cpp/variables.def b/scripts/clam/cpp/variables.def index 95933297..9ab02a87 100644 --- a/scripts/clam/cpp/variables.def +++ b/scripts/clam/cpp/variables.def @@ -919,7 +919,6 @@ ifeq "$(COMPILER)" "GNU_DARWIN" COMPILER_ROOT_DIR = / PLATFORM_ADD_IN = darwin ARCHITECTURE = $(shell machine 2>/dev/null || arch 2>/dev/null || echo i686) -# COMPILER_FLAGS += -fgnu-runtime export COMPILER_VERSION = $(shell $(SHELL) $(CLAM_SCRIPTS)/cpp/get_version.sh $(COMPILER) $(COMPILER_ROOT_DIR) ) @@ -978,6 +977,11 @@ ifeq "$(COMPILER)" "GNU_DARWIN" # pthread=thread libraries. # rt=real time libraries for shared memory. + # mac specific flags + COMPILER_FLAGS += -Wno-nullability-completeness +#trying this one again, which had been turned off. + COMPILER_FLAGS += -fgnu-runtime + ifneq "$(DEBUG)" "" # add in debugging flags. # COMPILER_FLAGS += -g3 -O0 -- 2.34.1