Skip to content

Commit 6f151bf

Browse files
committed
Added note about 'Other conflicts in the test file only'
1 parent 3d3eb01 commit 6f151bf

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

manual.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,10 @@ public:
379379

380380
Yes, its ugly. But usually people don't overload operator new everywhere. If you do, consider turning off the new macro completely.
381381

382+
### Other conflicts in the test file only
383+
384+
If your conflict is only in the test code files, put the CppUTest includes after your includes. Because of this potential conflict, its a good idea to put the CppUTest includes after your includes as a preemptive measure.
385+
382386
### Conflicts with MFC
383387

384388
Tbd

0 commit comments

Comments
 (0)