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.

diff --git a/infobase/fortunes.dat b/infobase/fortunes.dat
index c130710a6c745e86139804e0113b02084342a27e..735c480927f3fca76c3e6b190f63f3f28866a68e 100644 (file)
--- 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 70280742541430cea3703b6a6bb08e136bddfd0d..bb73a748bc9dd1137e29f77cc0081e2f0385c709 100644 (file)
--- 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 59ca5d70cc3cae4b1c337e2ea45880cab53859b4..2a88061cada797e432fc2108d0c4874395db22e7 100644 (file)
--- 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 95933297d3a08c1def9575bdca99ed87f2d61d50..9ab02a8702ce9832d4e8f45504a12ef22bacc647 100644 (file)
--- 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