Fixed ConditionSet to compile in new C++ compiler.