Modified header file for C++ compatibility
Merge branch 'master' of github.com:apetri/CFHTLens_analysis