All: fix a collision name between accessor function GetTimeStamp and GetTimeStamp in common.cpp.

In common.cpp GetTimeStamp is renamed GetNewTimeStamp (a better name).
Pcbnew: prepare work to calculate connections between pads that inteserct and therefore can be connected without any track (composite pads).
This commit is contained in:
jean-pierre charras
2011-12-07 16:49:32 +01:00
parent aac231c39a
commit 9c79b55078
33 changed files with 260 additions and 233 deletions
+8 -7
View File
@@ -525,18 +525,19 @@ bool ProcessExecute( const wxString& aCommandLine, int aFlags )
}
int GetTimeStamp()
unsigned long GetNewTimeStamp()
{
static int OldTimeStamp, NewTimeStamp;
static unsigned long oldTimeStamp;
unsigned long newTimeStamp;
NewTimeStamp = time( NULL );
newTimeStamp = time( NULL );
if( NewTimeStamp <= OldTimeStamp )
NewTimeStamp = OldTimeStamp + 1;
if( newTimeStamp <= oldTimeStamp )
newTimeStamp = oldTimeStamp + 1;
OldTimeStamp = NewTimeStamp;
oldTimeStamp = newTimeStamp;
return NewTimeStamp;
return newTimeStamp;
}