Index: driver/cc1.cc
===================================================================
--- driver/cc1.cc	(revision 55b060d686d3cac576f0c518302b16344a6fb205)
+++ driver/cc1.cc	(revision 7350330f5cd61b15d7b7d0bc6afa0bbe37c42c7d)
@@ -10,16 +10,14 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun  9 11:36:44 2023
-// Update Count     : 423
+// Last Modified On : Mon Sep 25 11:07:22 2023
+// Update Count     : 427
 //
 
 #include <iostream>
-using std::cerr;
-using std::endl;
 #include <string>
-using std::string;
 #include <algorithm>									// find
 #include <cstdio>										// stderr, stdout, perror, fprintf
 #include <cstdlib>										// getenv, exit, mkstemp
+using namespace std;
 #include <unistd.h>										// execvp, fork, unlink
 #include <sys/wait.h>									// wait
@@ -52,5 +50,5 @@
 	if ( dot == string::npos ) return;
 	const string * end = suffixes + NumSuffixes;
-	if ( std::find( suffixes, end, arg.substr( dot + 1 ) ) != end ) {
+	if ( find( suffixes, end, arg.substr( dot + 1 ) ) != end ) {
 		args[nargs++] = "-x";
 		args[nargs++] = "c";
@@ -153,11 +151,13 @@
 
 	#ifdef __DEBUG_H__
-	cerr << "Stage1" << endl;
+	cerr << "#########" << endl << "Stage1 " << string( 100, '#' ) << endl << "#########" << endl;
 	#endif // __DEBUG_H__
 	checkEnv1();										// arguments passed via environment variables
 	#ifdef __DEBUG_H__
+	cerr << string( 100, '*' ) << endl;
 	for ( int i = 1; i < argc; i += 1 ) {
 		cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
 	} // for
+	cerr << string( 100, '*' ) << endl;
 	#endif // __DEBUG_H__
 
@@ -260,5 +260,5 @@
 		} else {
 			args[nargs++] = "-x";
-			args[nargs++] = ( *new string( lang.c_str() ) ).c_str();
+			args[nargs++] = ( *new string( lang ) ).c_str();
 		} // if
 		args[nargs++] = cpp_in;
@@ -275,4 +275,5 @@
 		} // for
 		cerr << endl;
+		cerr << string( 100, '*' ) << endl;
 		#endif // __DEBUG_H__
 
@@ -298,5 +299,5 @@
 		} else {
 			args[nargs++] = "-x";
-			args[nargs++] = ( *new string( lang.c_str() ) ).c_str();
+			args[nargs++] = ( *new string( lang ) ).c_str();
 		} // if
 		args[nargs++] = cpp_in;							// input to cpp
@@ -346,11 +347,13 @@
 
 	#ifdef __DEBUG_H__
-	cerr << "Stage2" << endl;
+	cerr << "#########" << endl << "Stage2 " << string( 100, '#' ) << endl << "#########" << endl;
 	#endif // __DEBUG_H__
 	checkEnv2( cargs, ncargs );							// arguments passed via environment variables
 	#ifdef __DEBUG_H__
+	cerr << string( 100, '*' ) << endl;
 	for ( int i = 1; i < argc; i += 1 ) {
 		cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
 	} // for
+	cerr << string( 100, '*' ) << endl;
 	#endif // __DEBUG_H__
 
@@ -473,5 +476,5 @@
 		if ( CFA_flag ) {								// run cfa-cpp ?
 			if ( o_file.size() != 0 ) {					// location for output
-				cargs[ncargs++] = ( *new string( o_file.c_str() ) ).c_str();
+				cargs[ncargs++] = ( *new string( o_file ) ).c_str();
 			} // if
 		} else {
@@ -571,7 +574,5 @@
 int main( const int argc, const char * const argv[], __attribute__((unused)) const char * const env[] ) {
 	#ifdef __DEBUG_H__
-	for ( int i = 0; env[i] != nullptr; i += 1 ) {
-		cerr << env[i] << endl;
-	} // for
+	cerr << "#########" << endl << "main cc1 " << string( 100, '#' ) << endl << "#########" << endl;
 	#endif // __DEBUG_H__