mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0022898: IGES import fails in german environment
Added DRAW command dlocale to set and query current locale of the C subsystem Equivalents of C functions working with conversions of strings to/from reals added in Standard_CString, providing locale-independent behavior (using always "C" locale) In DRAW packages, calls to atof() and atoi() are replaced by direct calls to Draw::Atof() and Draw::Atoi(), respectively, instead of substituting by #define Use of atof(), strtod(), and *scanf() involving floating point conversions in OCCT code replaced by locale-independent Atof() and Strtod() Calls to sprintf() involving floating point in OCCT code are replaced by call to locale-independent Sprintf(), except a few places where converted strings are used immediately for display in the 3d viewer Changes of global locale are eliminated throughout OCCT code Proposed correction for GNU libC where v*printf_l functions are absent Added test case (bugs xde bug22898) for data exchange operations with non-standard locale Use xlocale on Mac OS X and within glibc Corrected strtod_l wrapper Generate error rather than warning Introduce Standard_CLocaleSentry replacement for removed OSD_Localizer Standard_CLocaleSentry - copy locale string Standard_CLocaleSentry - use _configthreadlocale on Windows Standard_CLocaleSentry::GetCLocale() - return locale_t rather than void* Corrected misprint in ~Standard_CLocaleSentry() Use French locale in bug22898 test case Mark test case as skipped if locale is unavailable on tested system. Use fr_FR locale for tests on Mac OS X
This commit is contained in:
@@ -1548,20 +1548,10 @@ Handle(Storage_Data)& Storage_Schema::ICurrentData()
|
||||
|
||||
TCollection_AsciiString Storage_Schema::ICreationDate()
|
||||
{
|
||||
// on sauvegarde l'ancien LC_NUMERIC
|
||||
char *oldnum,*plocal ;
|
||||
plocal = setlocale(LC_NUMERIC, NULL);
|
||||
oldnum = new char[strlen(plocal)+1] ;
|
||||
strcpy(oldnum,plocal);
|
||||
|
||||
|
||||
char nowstr[SLENGTH];
|
||||
time_t nowbin;
|
||||
struct tm *nowstruct;
|
||||
|
||||
(void)setlocale(LC_ALL, "");
|
||||
|
||||
if (time(&nowbin) == (time_t) - 1)
|
||||
if (time(&nowbin) == (time_t)-1)
|
||||
cerr << "Storage ERROR : Could not get time of day from time()" << endl;
|
||||
|
||||
nowstruct = localtime(&nowbin);
|
||||
@@ -1570,11 +1560,6 @@ TCollection_AsciiString Storage_Schema::ICreationDate()
|
||||
cerr << "Storage ERROR : Could not get string from strftime()" << endl;
|
||||
|
||||
TCollection_AsciiString t(nowstr);
|
||||
|
||||
// on remet le LC_NUMERIC a la precedente valeur
|
||||
setlocale(LC_NUMERIC, oldnum);
|
||||
delete[] oldnum;
|
||||
|
||||
return t;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user