Skip to content

Commit 081a819

Browse files
committed
s/in/with the/
1 parent 0123599 commit 081a819

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

manual.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ Now the call to the compiler needs to be -include MyOwnNewMacros.h and this will
320320

321321
### Conflicts with my own overload!
322322

323-
This one is harder (and luckily less common). You can solve this the same way as the conflict in STL, but it's probably better to use a finer grained control. So, instead you can temporary disable the new macros, overload operator new, enable the new macro again. This can be done with the following code:
323+
This one is harder (and luckily less common). You can solve this the same way as the conflict with the STL, but it's probably better to use a finer grained control. So, instead you can temporary disable the new macros, overload operator new, enable the new macro again. This can be done with the following code:
324324

325325
{% highlight c++ %}
326326
class NewDummyClass

0 commit comments

Comments
 (0)