Skip to content

Commit 97c66af

Browse files
bernhardmgruberhageboeck
authored andcommitted
Input all tex files directly from the main one
1 parent 9813148 commit 97c66af

File tree

9 files changed

+91
-102
lines changed

9 files changed

+91
-102
lines changed

talk/C++Course.tex

Lines changed: 91 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,23 @@
7878
\end{tiny}
7979
\end{frame}
8080

81-
\include{introduction/introduction}
82-
\include{basicconcepts/basicconcepts}
81+
\section[Intro]{History and goals}
82+
\input{introduction/history}
83+
\input{introduction/goals}
84+
85+
\section[base]{Language basics}
86+
\input{basicconcepts/coresyntax}
87+
\input{basicconcepts/arrayspointers}
88+
\input{basicconcepts/scopesnamespaces}
89+
\input{basicconcepts/classenum}
90+
\input{basicconcepts/references}
91+
\input{basicconcepts/functions}
92+
\input{basicconcepts/operators}
93+
\input{basicconcepts/control}
94+
\input{basicconcepts/headersinterfaces}
95+
\input{basicconcepts/auto}
96+
\input{basicconcepts/inline}
97+
\input{basicconcepts/assert}
8398

8499
% basic version has subset of tools at this stage
85100
\ifthenelse{\boolean{onlybasics}}{
@@ -92,36 +107,86 @@
92107
}{}
93108

94109
% basic version only keeps a subset of these 2 chapters
110+
\section[OO]{Object orientation (OO)}
95111
\ifthenelse{\boolean{onlybasics}}{
96-
\section[OO]{Object orientation (OO)}
97-
\input{objectorientation/objectsclasses}
98-
\input{objectorientation/inheritance}
99-
\input{objectorientation/constructors}
100-
\input{objectorientation/static}
101-
\input{objectorientation/allocations}
102-
\input{objectorientation/advancedoo}
103-
\input{objectorientation/typecasting}
104-
\input{objectorientation/operators}
105-
\input{objectorientation/functors}
106-
107-
\section[More]{Core modern \cpp}
108-
\input{morelanguage/constness}
109-
\input{morelanguage/exceptions}
110-
\input{morelanguage/templates}
111-
\input{morelanguage/stl}
112-
\input{morelanguage/lambda}
113-
\input{morelanguage/raii}
112+
\input{objectorientation/objectsclasses}
113+
\input{objectorientation/inheritance}
114+
\input{objectorientation/constructors}
115+
\input{objectorientation/static}
116+
\input{objectorientation/allocations}
117+
\input{objectorientation/advancedoo}
118+
\input{objectorientation/typecasting}
119+
\input{objectorientation/operators}
120+
\input{objectorientation/functors}
114121
} {
115-
\include{objectorientation/objectorientation}
116-
\include{morelanguage/morelanguage}
122+
\input{objectorientation/objectsclasses}
123+
\input{objectorientation/inheritance}
124+
\input{objectorientation/constructors}
125+
\input{objectorientation/static}
126+
\input{objectorientation/allocations}
127+
\input{objectorientation/advancedoo}
128+
\input{objectorientation/typecasting}
129+
\input{objectorientation/operators}
130+
\input{objectorientation/functors}
131+
\input{objectorientation/adl}
132+
}
133+
134+
\section[More]{Core modern \cpp}
135+
\ifthenelse{\boolean{onlybasics}}{
136+
\input{morelanguage/constness}
137+
\input{morelanguage/exceptions}
138+
\input{morelanguage/templates}
139+
\input{morelanguage/stl}
140+
\input{morelanguage/lambda}
141+
\input{morelanguage/raii}
142+
} {
143+
\input{morelanguage/constness}
144+
\input{morelanguage/constexpr}
145+
\input{morelanguage/exceptions}
146+
\input{morelanguage/move}
147+
\input{morelanguage/copyelision}
148+
\input{morelanguage/templates}
149+
\input{morelanguage/stl}
150+
\input{morelanguage/morestl}
151+
\input{morelanguage/lambda}
152+
\input{morelanguage/raii}
153+
\input{morelanguage/initialization}
117154
}
118155

119156
% do not include these chapters in basic version
120157
\ifthenelse{\boolean{onlybasics}}{}{
121-
\include{expert/expert}
122-
\include{tools/tools}
123-
\include{concurrency/concurrency}
124-
\include{python/python}
158+
\section[exp]{Expert \cpp}
159+
\input{expert/variadictemplate}
160+
\input{expert/perfectforwarding}
161+
\input{expert/sfinae}
162+
\input{expert/cpp20concepts}
163+
\input{expert/cpp20spaceship}
164+
\input{expert/modules}
165+
166+
\section[Tool]{Useful tools}
167+
\input{tools/editors}
168+
\input{tools/vcs}
169+
\input{tools/formatting}
170+
\input{tools/compiling}
171+
\input{tools/webtools}
172+
\input{tools/debugging}
173+
\input{tools/sanitizers}
174+
\input{tools/valgrind}
175+
\input{tools/staticanalysis}
176+
\input{tools/profiling}
177+
\input{tools/doxygen}
178+
179+
\section[conc]{Concurrency}
180+
\input{concurrency/threadsasync}
181+
\input{concurrency/mutexes}
182+
\input{concurrency/atomic}
183+
\input{concurrency/condition}
184+
185+
\section[py]{\cpp and python}
186+
\input{python/modulewriting}
187+
\input{python/marryingcandcpp}
188+
\input{python/ctypes}
189+
\input{python/cppyy}
125190
}
126191

127192
\begin{frame}

talk/basicconcepts/basicconcepts.tex

Lines changed: 0 additions & 14 deletions
This file was deleted.

talk/concurrency/concurrency.tex

Lines changed: 0 additions & 6 deletions
This file was deleted.

talk/expert/expert.tex

Lines changed: 0 additions & 8 deletions
This file was deleted.

talk/introduction/introduction.tex

Lines changed: 0 additions & 4 deletions
This file was deleted.

talk/morelanguage/morelanguage.tex

Lines changed: 0 additions & 13 deletions
This file was deleted.

talk/objectorientation/objectorientation.tex

Lines changed: 0 additions & 12 deletions
This file was deleted.

talk/python/python.tex

Lines changed: 0 additions & 6 deletions
This file was deleted.

talk/tools/tools.tex

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)