Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision 44bca7f23e3aeeef424982f0cb5995957e13f44c)
+++ src/driver/cfa.cc	(revision ade52728204b1fb638e539ca3bc2ea5abb2d80a2)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  2 14:32:08 2018
-// Update Count     : 222
+// Last Modified On : Wed May  2 17:57:43 2018
+// Update Count     : 224
 //
 
@@ -176,11 +176,8 @@
 					unsigned int adv = prefix( arg, "-Wno-" ) ? 5 : 2;
 					args[nargs] = argv[i];				// conditionally pass the argument along
-					char * warning = argv[i] + adv;		// extract warning
-					for ( const auto w : WarningFormats ) {
-						if ( strcmp( warning, w.name ) == 0 ) {	// replace the argument for cfa-cpp
-							args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str();
-							break;
-						} // if
-					} // for
+					const char * warning = argv[i] + adv;	  // extract warning
+					if ( SemanticWarning_Exist( warning ) ) { // replace the argument for cfa-cpp
+						args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str();
+					} // if
 					nargs += 1;
 				} // if