Changeset 35a4b94d

Timestamp:

Jan 18, 2018, 2:59:06 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

d27f609

Parents:

721c3146 (diff), 5eba8ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Files:

• doc/proposals/concurrency/text/frontpgs.tex (modified) (2 diffs)
• doc/proposals/concurrency/thesis.tex (modified) (1 diff)
• doc/proposals/concurrency/version (modified) (1 diff)
• tools/repeat.c (modified) (2 diffs)

doc/proposals/concurrency/text/frontpgs.tex

@@ -39 +39 @@
         \vspace*{2.0cm}
 
-        Waterloo, Ontario, Canada, 2017 \\
+        Waterloo, Ontario, Canada, 2018 \\
 
         \vspace*{1.0cm}
 
-        \copyright\ Thierry Delisle 2017 \\
+        \copyright\ Thierry Delisle 2018 \\
         \end{center}
 \end{titlepage}
@@ -154 +154 @@
 % \newpage
 
+% L I S T   O F   T A B L E S
+% -----------------------------
+\addcontentsline{toc}{chapter}{List of Acronyms}
+\printglossary[type=\acronymtype,title={List of Acronyms}]
+\cleardoublepage
+\phantomsection         % allows hyperref to link to the correct page
+
 % Change page numbering back to Arabic numerals
 \pagenumbering{arabic}

doc/proposals/concurrency/thesis.tex

@@ -125 +125 @@
 \input{future}
 
-\clearpage
-\printglossary[type=\acronymtype]
-\printglossary
 
 \clearpage
+
+% B I B L I O G R A P H Y
+% -----------------------------
+\addcontentsline{toc}{chapter}{Bibliography}
 \bibliographystyle{plain}
 \bibliography{pl,local}
+\cleardoublepage
+\phantomsection         % allows hyperref to link to the correct page
+
+% G L O S S A R Y
+% -----------------------------
+\addcontentsline{toc}{chapter}{Glossary}
+\printglossary
+\cleardoublepage
+\phantomsection         % allows hyperref to link to the correct page
 
 

doc/proposals/concurrency/version

@@ -1 @@
-0.11.391
+0.11.403

tools/repeat.c

@@ -26 +26 @@
                 if(print_iterations) {
                         printf("\r%d / %d", i, repetitions);
+                        fflush(stdout);
                 }
                 int retcode = run();
@@ -47 +48 @@
         fprintf(out, "Repeat CMD N times\n\n");
         fprintf(out, "\t-h,--help\tprint this usage message\n");
-        fprintf(out, "\t-s\tstop on error\n");
-        fprintf(out, "\t-i\toutput iterations instead of CMD stdout\n");
-        fprintf(out, "\t-x\tprint CMD before running it\n");
+        fprintf(out, "\t-s\t\tstop on error\n");
+        fprintf(out, "\t-i\t\toutput iterations instead of CMD stdout\n");
+        fprintf(out, "\t-x\t\tprint CMD before running it\n");
         exit(code);
 }