CAROLINE-30: Fix singleton compilation on gcc.
Merge pull request #101 from it-workshop/wp/CAROLINE-30/1

CAROLINE-30: Fix singleton compilation on gcc.