Commit 5bf6194

committed

Small refinements for objectorientation chapter.

1 parent 3b54c58 commit 5bf6194Copy full SHA for 5bf6194

File tree

+35

-13

lines changed

+35

-13

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -244,8 +244,7 @@`
`244`	`244`	`\frametitlecpp[11]{{\texttt override} keyword}`
`245`	`245`	`\begin{block}{Principle}`
`246`	`246`	`\begin{itemize}`
`247`		`- \item when overriding a virtual method`
`248`		`- \item the \cppinline\|override\| keyword should be used`
	`247`	`+ \item when overriding a virtual method, the \cppinline\|override\| keyword should be used`
`249`	`248`	`\item the \cppinline\|virtual\| keyword is then optional`
`250`	`249`	`\end{itemize}`
`251`	`250`	`\end{block}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`\item each thread in a process has its own stack`
`38`	`38`	`\begin{itemize}`
`39`	`39`	\item allocations on the stack are thus ``thread private''
`40`		`- \item and do not introduce any threadsafety issues`
	`40`	`+ \item and do not introduce any thread-safety issues`
`41`	`41`	`\end{itemize}`
`42`	`42`	`\end{itemize}`
`43`	`43`	`\end{block}`
`@@ -77,7 +77,7 @@`
`77`	`77`	`\item there is a single, shared heap per process`
`78`	`78`	`\begin{itemize}`
`79`	`79`	`\item allows to share data between threads`
`80`		`- \item introduces race conditions and threadsafety issues!`
	`80`	`+ \item introduces race conditions and thread-safety issues!`
`81`	`81`	`\end{itemize}`
`82`	`82`	`\end{itemize}`
`83`	`83`	`\end{block}`

Lines changed: 27 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,27 @@`
`106`	`106`
`107`	`107`	`\begin{frame}[fragile]`
`108`	`108`	`\frametitlecpp[98]{Class Constructors and Destructors}`
	`109`	`+ \begin{overprint}`
	`110`	`+ \onslide<1>`
	`111`	`+ \begin{cppcode}`
	`112`	`+ class Vector {`
	`113`	`+ public:`
	`114`	`+ Vector(int n);`
	`115`	`+ Vector(const Vector &other);`
	`116`	`+ ~Vector();`
	`117`	`+ private:`
	`118`	`+ int len; int* data;`
	`119`	`+ };`
	`120`	`+ Vector::Vector(int n) : len(n) {`
	`121`	`+ data = new int[n];`
	`122`	`+ }`
	`123`	`+`
	`124`	`+`
	`125`	`+`
	`126`	`+`
	`127`	`+ Vector::~Vector() { delete[] data; }`
	`128`	`+ \end{cppcode}`
	`129`	`+ \onslide<2>`
`109`	`130`	`\begin{cppcode}`
`110`	`131`	`class Vector {`
`111`	`132`	`public:`
`@@ -124,6 +145,8 @@`
`124`	`145`	`}`
`125`	`146`	`Vector::~Vector() { delete[] data; }`
`126`	`147`	`\end{cppcode}`
	`148`	`+`
	`149`	`+ \end{overprint}`
`127`	`150`	`\end{frame}`
`128`	`151`
`129`	`152`	`\begin{frame}[fragile]`
`@@ -266,8 +289,8 @@`
`266`	`289`	`\begin{block}{After object declaration, arguments within \{\}}`
`267`	`290`	`\begin{cppcode*}{}`
`268`	`291`	`struct A {`
`269`		`- int a;`
`270`		`- float b;`
	`292`	`+ int i;`
	`293`	`+ float f;`
`271`	`294`	`A();`
`272`	`295`	`A(int);`
`273`	`296`	`A(int, int);`
`@@ -287,8 +310,8 @@`
`287`	`310`	`\begin{block}{Arguments are given within (), aka \cpp98 nightmare}`
`288`	`311`	`\begin{cppcode*}{}`
`289`	`312`	`struct A {`
`290`		`- int a;`
`291`		`- float b;`
	`313`	`+ int i;`
	`314`	`+ float f;`
`292`	`315`	`A();`
`293`	`316`	`A(int);`
`294`	`317`	`A(int, int);`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`float m_real, m_imaginary;`
`8`	`8`	`Complex(float real, float imaginary);`
`9`	`9`	`Complex operator+(const Complex& other) {`
`10`		`- return Complex(m_real + other.m_real,`
`11`		`- m_imaginary + other.m_imaginary);`
	`10`	`+ return Complex{m_real + other.m_real,`
	`11`	`+ m_imaginary + other.m_imaginary};`
`12`	`12`	`}`
`13`	`13`	`};`
`14`	`14`
`@@ -57,7 +57,7 @@`
`57`	`57`	`struct Complex {`
`58`	`58`	`float m_real, m_imaginary;`
`59`	`59`	`Complex operator+(float other) {`
`60`		`- return Complex(m_real + other, m_imaginary);`
	`60`	`+ return Complex{m_real + other, m_imaginary};`
`61`	`61`	`}`
`62`	`62`	`};`
`63`	`63`	`Complex c1{2.f, 3.f};`
`@@ -67,7 +67,7 @@`
`67`	`67`	`\pause`
`68`	`68`	`\begin{cppcode*}{firstnumber=10}`
`69`	`69`	`Complex operator+(float a, const Complex& obj) {`
`70`		`- return Complex(a + obj.m_real, obj.m_imaginary);`
	`70`	`+ return Complex{a + obj.m_real, obj.m_imaginary};`
`71`	`71`	`}`
`72`	`72`	`\end{cppcode*}`
`73`	`73`	`\end{block}`
`@@ -102,7 +102,7 @@`
`102`	`102`	`\item They gain access to all private/protected members`
`103`	`103`	`\item Useful for operators such as \cppinline{a + b}`
`104`	`104`	`\item Don't abuse friends to go around a wrongly designed interface`
`105`		`- \item Avoid unexpected modifications of class state in a friend`
	`105`	`+ \item Avoid unexpected modifications of class state in a friend!`
`106`	`106`	`\end{itemize}`
`107`	`107`	`\end{block}`
`108`	`108`	`\begin{exampleblock}{\texttt{operator+} as a friend}`

Comments

(0)