Minor Fixes

[rwk-unil]

Three commits with minor fixes :

1. Added parentheses around assignment (=) in if clause to remove warning and show that the assignment is intended.
2. Fixed potentially dangerous macros (expansions can lead to unwanted behaviour because of operator precedence).
3. Fixed missing std:: namespace tags