From: Chris Koeritz Date: Fri, 8 Mar 2013 04:46:33 +0000 (-0500) Subject: updated cpp style. X-Git-Tag: 2.140.90~1064 X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=59a280aa786c39821d20a80e7540e0b34b08df6c updated cpp style. refactored amorph, but this may not go well since i only see the file itself with a change. --- diff --git a/database/configuration/eclipse/cpp-fredstyle_2013_03_03.xml b/database/configuration/eclipse/cpp-fredstyle_2013_03_03.xml deleted file mode 100644 index 5e5ad32d..00000000 --- a/database/configuration/eclipse/cpp-fredstyle_2013_03_03.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/database/configuration/eclipse/cpp-fredstyle_2013_03_07.xml b/database/configuration/eclipse/cpp-fredstyle_2013_03_07.xml new file mode 100644 index 00000000..373c8ddb --- /dev/null +++ b/database/configuration/eclipse/cpp-fredstyle_2013_03_07.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nucleus/library/structures/amorph.h b/nucleus/library/structures/amorph.h index 9ffdad8c..6d817e8a 100644 --- a/nucleus/library/structures/amorph.h +++ b/nucleus/library/structures/amorph.h @@ -76,9 +76,12 @@ public: index "new_maximum" and upwards are thrown away. existing fields are kept. */ - void reset(int new_maximum = 0); + void resize(int new_maximum = 0); //!< like adjust but doesn't keep existing contents. + void reset() { this->resize(0); } + //!< cleans out all of the contents. + basis::outcome put(int field, const contents *data); //!< Enters an object into the field at index "field" in the amorph. /*!< If "data" is NIL, then the field is cleared. The amorph considers the @@ -280,7 +283,7 @@ void amorph::check_fields(const char *where) const } template -void amorph::reset(int new_maximum) +void amorph::resize(int new_maximum) { FUNCDEF("reset"); CHECK_FIELDS;