Skip to content

Commit 212f68d

Browse files
committed
Fixed some formatting in the manual
1 parent 0bfe12d commit 212f68d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

manual.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ TEST_GROUP(FooTestGroup)
190190

191191
void teardown()
192192
{
193-
// Uninit stuff
193+
// Un-init stuff
194194
}
195195
};
196196

@@ -344,10 +344,10 @@ If you want to completely disable memory leak detection then you can do so by bu
344344

345345
### Conflicts with operator new macros (STL!)
346346

347-
It is common for the memory leak detection macros to conflict with an overloaded operator new or with STL. This is because the macro replaces the call to operator new to a call to operator new with __FILE__, and __LINE__. If you overload operator new, it will replace your overloaded definition resulting in a compiler error. This is common when using the Standard C++ library (STL).
347+
It is common for the memory leak detection macros to conflict with an overloaded operator new or with STL. This is because the macro replaces the call to operator new to a call to operator new with `__FILE__`, and `__LINE__`. If you overload operator new, it will replace your overloaded definition resulting in a compiler error. This is common when using the Standard C++ library (STL).
348348

349349
#### Resolving conflicts with STL
350-
The easiest way is to not pass the --include MemoryLeakDetectionNewMacros.h to the compiler, but this would lose all your file and line information. So this is not recommended. An alternative is to create your own NewMacros.h file which will include the STL file *before* the new macro is defined. For example, the following NewMacros file can be used for a program that uses std::list:
350+
The easiest way is to not pass the `--include MemoryLeakDetectionNewMacros.h` to the compiler, but this would lose all your file and line information. So this is not recommended. An alternative is to create your own NewMacros.h file which will include the STL file *before* the new macro is defined. For example, the following NewMacros file can be used for a program that uses std::list:
351351

352352
{% highlight c++ %}
353353
#include "list"

0 commit comments

Comments
 (0)