Commit 70db547

authored

Merge pull request #165 from bernhardmgruber/fixes

Two small fixes and a rename

2 parents 3a08132 + 4927207 commit 70db547Copy full SHA for 70db547

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -274,11 +274,11 @@`
`274`	`274`	`struct B {`
`275`	`275`	`int a;`
`276`	`276`	`float b;`
`277`		`- // no constructor declared!`
	`277`	`+ // no constructor`
`278`	`278`	`};`
`279`	`279`	`\end{cppcode*}`
`280`	`280`	`\end{multicols}`
`281`		`- \begin{cppcode*}{gobble=2, firstnumber=12}`
	`281`	`+ \begin{cppcode*}{gobble=2, firstnumber=13}`
`282`	`282`	`A a{1,2}; // A::A(int, int)`
`283`	`283`	`A a{1}; // A::A(int)`
`284`	`284`	`A a{}; // A::A()`
`@@ -307,11 +307,11 @@`
`307`	`307`	`struct B {`
`308`	`308`	`int a;`
`309`	`309`	`float b;`
`310`		`- // no constructor declared!`
	`310`	`+ // no constructor`
`311`	`311`	`};`
`312`	`312`	`\end{cppcode*}`
`313`	`313`	`\end{multicols}`
`314`		`- \begin{cppcode*}{gobble=2, firstnumber=12}`
	`314`	`+ \begin{cppcode*}{gobble=2, firstnumber=13}`
`315`	`315`	`A a(1,2); // A::A(int, int)`
`316`	`316`	`A a(1); // A::A(int)`
`317`	`317`	`A a(); // declaration of a function !`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@`
`14`	`14`	`public:`
`15`	`15`	`static std::string upper(std::string) {...}`
`16`	`16`	`private:`
`17`		- static int s_nbCallsToUpper; // add `inline` in C++17
	`17`	+ static int callsToUpper; // add `inline` in C++17
`18`	`18`	`};`
`19`		`- int Text::s_nbCallsToUpper = 0; // required before C++17`
	`19`	`+ int Text::callsToUpper = 0; // required before C++17`
`20`	`20`	`std::string uppers = Text::upper("my text");`
`21`		`- // now Text::s_nbCallsToUpper is 1`
	`21`	`+ // now Text::callsToUpper is 1`
`22`	`22`	`\end{cppcode}`
`23`	`23`	`\end{frame}`

Comments

(0)