Attachment #203530 for bug #284200




void grit_dump(GritRec *gr, FILE *fp);
void grit_dump_short(GritRec *gr, FILE *fp, const char *pre);

//typedef std::vector<char*> strvec;


// --------------------------------------------------------------------

		if(!files.empty())
		{
			// find first non-path
			
			// Date: 08/09/2009
			// User: Kim Nilsson ( Gentoo Linux amd64 )
			// Issue: Would not compile ( x86_64-pc-linux-gnu GCC 4.4.1)
			// Fix: Changed for-loop to use an iterator so the insertion would not complain.
			strvec::iterator iter;
			for( iter = args.begin(); iter != args.end(); iter++ )
			{
				if( ( *iter )[0] == '-' )
				{
					args.insert( iter, files.begin(), files.end() );
					break;
				}
			}
		}

	}

Return to bug 284200

Lines 49-55 Link Here

(-)/var/tmp/portage/dev-util/grit-0.8.3/work/grit_src/srcgrit/grit_main.cpp (-5 / +14 lines)
49	void grit_dump(GritRec gr, FILE fp);	49	void grit_dump(GritRec gr, FILE fp);
50	void grit_dump_short(GritRec gr, FILE fp, const char *pre);	50	void grit_dump_short(GritRec gr, FILE fp, const char *pre);
51		51
52	// typedef std::vector<char*> strvec;	52	//typedef std::vector<char*> strvec;
53		53
54		54
55	// --------------------------------------------------------------------	55	// --------------------------------------------------------------------
Lines 786-796 Link Here
786	if(!files.empty())	786	if(!files.empty())
787	{	787	{
788	// find first non-path	788	// find first non-path
789	for(ii=0; ii<argc; ii++)	789
790	if(args[ii][0]=='-')	790	// Date: 08/09/2009
		791	// User: Kim Nilsson ( Gentoo Linux amd64 )
		792	// Issue: Would not compile ( x86_64-pc-linux-gnu GCC 4.4.1)
		793	// Fix: Changed for-loop to use an iterator so the insertion would not complain.
		794	strvec::iterator iter;
		795	for( iter = args.begin(); iter != args.end(); iter++ )
		796	{
		797	if( ( *iter )[0] == '-' )
		798	{
		799	args.insert( iter, files.begin(), files.end() );
791	break;	800	break;
792		801	}
793	args.insert(&args[ii], files.begin(), files.end());	802	}
794	}	803	}
795		804
796	}	805	}