remove  ADIOS_QUERY_TOOL_OTHER = 2 from enum, and make ADIOS_QUERY_TOOL_COUNT part of enum