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:
+8
-7
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user