codelite: Fix building with clang 3.5
codelite: Now all patches are committed upstream.