diff --git a/annotations/VERSION b/annotations/VERSION index 745bb7a6..66280a8c 100644 --- a/annotations/VERSION +++ b/annotations/VERSION @@ -1,2 +1,2 @@ -#define VERSION "11.4.0" +#define VERSION "11.4.1" #define YEARS "1994-2020" diff --git a/annotations/changelog b/annotations/changelog index bd6252c9..41f7efa5 100644 --- a/annotations/changelog +++ b/annotations/changelog @@ -2,8 +2,12 @@ C++-annotations (11.4.1) * Updated the descriptions of some functions in the filesystem namespace. + * Fixed some typos + * Following a fix suggested by Tony Mancill the US variants of the ps/pdf + formats of the C++-annotations are now using the 'letter' paper format + -- Frank B. Brokken Sun, 30 Aug 2020 13:36:27 +0200 C++-annotations (11.4.0) diff --git a/annotations/yo/stl/examples/inilist/inilist/data.cc b/annotations/yo/stl/examples/inilist/inilist/data.cc index e544e835..d66f9a9b 100644 --- a/annotations/yo/stl/examples/inilist/inilist/data.cc +++ b/annotations/yo/stl/examples/inilist/inilist/data.cc @@ -2,4 +2,3 @@ #include "inilist.ih" size_t IniList::s_count = 0; - diff --git a/annotations/yo/stl/examples/inilist/inilist/destructor.cc b/annotations/yo/stl/examples/inilist/inilist/destructor.cc index 4dcd6a49..a98f3fc9 100644 --- a/annotations/yo/stl/examples/inilist/inilist/destructor.cc +++ b/annotations/yo/stl/examples/inilist/inilist/destructor.cc @@ -6,7 +6,7 @@ IniList::~IniList() if (d_id == d_owner) { s_memory[d_index] = false; - cout << "destroying object " << d_id << " and memory[" << + cout << "destroying object " << d_id << " and memory[" << d_index << "]\n"; } else diff --git a/annotations/yo/stl/examples/inilist/inilist/inilist.h b/annotations/yo/stl/examples/inilist/inilist/inilist.h index 3c03f5c0..11eb3333 100644 --- a/annotations/yo/stl/examples/inilist/inilist/inilist.h +++ b/annotations/yo/stl/examples/inilist/inilist/inilist.h @@ -24,5 +24,5 @@ class IniList void check(char const *label); // checks the availability of its // memory }; - + #endif diff --git a/annotations/yo/stl/examples/inilist/inilist/inilist.ih b/annotations/yo/stl/examples/inilist/inilist/inilist.ih index 45c98bdd..08aa3670 100644 --- a/annotations/yo/stl/examples/inilist/inilist/inilist.ih +++ b/annotations/yo/stl/examples/inilist/inilist/inilist.ih @@ -3,4 +3,3 @@ #include using namespace std; - diff --git a/annotations/yo/stl/examples/inilist/inilist/inilist1.cc b/annotations/yo/stl/examples/inilist/inilist/inilist1.cc index 47c28476..d9b8b983 100644 --- a/annotations/yo/stl/examples/inilist/inilist/inilist1.cc +++ b/annotations/yo/stl/examples/inilist/inilist/inilist1.cc @@ -11,5 +11,3 @@ IniList::IniList() cout << "created object " << d_id << " using memory[" << d_index << "]\n"; } - - diff --git a/annotations/yo/stl/examples/inilist/inilist/inilist2.cc b/annotations/yo/stl/examples/inilist/inilist/inilist2.cc index c0930be5..0f3f6a8d 100644 --- a/annotations/yo/stl/examples/inilist/inilist/inilist2.cc +++ b/annotations/yo/stl/examples/inilist/inilist/inilist2.cc @@ -7,7 +7,7 @@ IniList::IniList(IniList const &other) d_owner(other.d_owner), // this object doesn't own the memory d_index(other.d_index) // and use other's memory index { - cout << "CC: object " << d_id << " using memory[" << d_index << + cout << "CC: object " << d_id << " using memory[" << d_index << "], owned by object " << d_owner << '\n'; check("copy: "); } diff --git a/annotations/yo/stl/examples/inilist/main.cc b/annotations/yo/stl/examples/inilist/main.cc index 54ebe967..73e987af 100644 --- a/annotations/yo/stl/examples/inilist/main.cc +++ b/annotations/yo/stl/examples/inilist/main.cc @@ -34,10 +34,4 @@ int main(int argc, char **argv) "\n"; map.find(1)->second.check("element from map: "); -} - - - - - - +} diff --git a/annotations/yo/stl/examples/inilist/xerr/xerr.ih b/annotations/yo/stl/examples/inilist/xerr/xerr.ih index 64ce5436..06fcd493 100644 --- a/annotations/yo/stl/examples/inilist/xerr/xerr.ih +++ b/annotations/yo/stl/examples/inilist/xerr/xerr.ih @@ -1,19 +1,18 @@ // define X to activate the xerr/xerr2 macros: -// xerr(insertion) +// xerr(insertion) // inserts the '<<' concatenated elements into std::cerr // preceded by the name of the source file, and ended by '\n' -// xerr2(insertion, code) +// xerr2(insertion, code) // performs the insertion if X is defined, and (unconditionally) // executes the statement(s) in `code'. `code' must be valid -// C(++) code. -// +// C(++) code. +// #ifdef XERR #include #define xerr(insertion) std::cerr << __FILE__": " << insertion << '\n' #define xerr2(insertion, b) \ { std::cerr << __FILE__": " << insertion << '\n'; b; } #else - #define xerr(insertion) + #define xerr(insertion) #define xerr2(insertion, b) b #endif -