OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0023274: MSVC++ warnings issued during compilation for 64bits

Browse Source 
Replacing Standard_Integer with Standard_Size to avoid warnings.
This commit is contained in:
Pawel
2012-07-12 17:24:03 +02:00
committed by Pawel Kowalski
parent 8ad8260234
commit fb8a73581a
11 changed files with 67 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/FSD/FSD_BinaryFile.cdl
View File

@@ -306,7 +306,7 @@ is
returns CString from Standard is private;
---C++: return const
ReadChar(me : in out; buffer : in out AsciiString from TCollection; rsize : Integer from Standard) is protected;
ReadChar(me : in out; buffer : in out AsciiString from TCollection; rsize : Size from Standard) is protected;
---Purpose: read <rsize> character from the current position.
ReadString(me : in out; buffer : in out AsciiString from TCollection) is protected;

8
src/FSD/FSD_BinaryFile.cxx
View File

@@ -61,7 +61,7 @@ Storage_Error FSD_BinaryFile::IsGoodFileType(const TCollection_AsciiString& aNam
if (s == Storage_VSOk) {
TCollection_AsciiString l;
Standard_Integer len = strlen(FSD_BinaryFile::MagicNumber());
Standard_Size len = strlen(FSD_BinaryFile::MagicNumber());
f.ReadChar(l,len);
@@ -156,10 +156,10 @@ const Standard_CString FSD_BinaryFile::MagicNumber()
//purpose : read <rsize> character from the current position.
//=======================================================================
void FSD_BinaryFile::ReadChar(TCollection_AsciiString& buffer, const Standard_Integer rsize)
void FSD_BinaryFile::ReadChar(TCollection_AsciiString& buffer, const Standard_Size rsize)
{
char c;
Standard_Integer ccount = 0;
Standard_Size ccount = 0;
buffer.Clear();
@@ -487,7 +487,7 @@ Storage_Error FSD_BinaryFile::BeginReadInfoSection()
{
Storage_Error s = Storage_VSOk;
TCollection_AsciiString l;
Standard_Integer len = strlen(FSD_BinaryFile::MagicNumber());
Standard_Size len = strlen(FSD_BinaryFile::MagicNumber());
ReadChar(l,len);

2
src/FSD/FSD_CmpFile.cdl
View File

@@ -313,7 +313,7 @@ is
WriteExtendedLine(me : in out; buffer : ExtendedString from TCollection) is protected;
---Purpose: write from the current position to the end of line.
ReadChar(me : in out; buffer : in out AsciiString from TCollection; rsize : Integer from Standard) is protected;
ReadChar(me : in out; buffer : in out AsciiString from TCollection; rsize : Size from Standard) is protected;
---Purpose: read <rsize> character from the current position.
ReadString(me : in out; buffer : in out AsciiString from TCollection) is protected;

12
src/FSD/FSD_CmpFile.cxx
View File

@@ -68,7 +68,7 @@ Storage_Error FSD_CmpFile::IsGoodFileType(const TCollection_AsciiString& aName)
if (s == Storage_VSOk) {
TCollection_AsciiString l;
Standard_Integer len = strlen(FSD_CmpFile::MagicNumber());
Standard_Size len = strlen(FSD_CmpFile::MagicNumber());
f.ReadChar(l,len);
@@ -215,7 +215,7 @@ void FSD_CmpFile::ReadLine(TCollection_AsciiString& buffer)
Buffer[0] = '\0';
//myStream.get(Buffer,8192,'\n');
myStream.getline(Buffer,8192,'\n');
for (Standard_Integer lv = (strlen(Buffer)- 1); lv > 1 && (Buffer[lv] == '\r' || Buffer[lv] == '\n') ;lv--) {
for (Standard_Size lv = (strlen(Buffer)- 1); lv > 1 && (Buffer[lv] == '\r' || Buffer[lv] == '\n') ;lv--) {
Buffer[lv] = '\0';
}
@@ -332,10 +332,10 @@ void FSD_CmpFile::ReadExtendedLine(TCollection_ExtendedString& buffer)
//purpose : read <rsize> character from the current position.
//=======================================================================
void FSD_CmpFile::ReadChar(TCollection_AsciiString& buffer, const Standard_Integer rsize)
void FSD_CmpFile::ReadChar(TCollection_AsciiString& buffer, const Standard_Size rsize)
{
char c;
Standard_Integer ccount = 0;
Standard_Size ccount = 0;
buffer.Clear();
@@ -363,7 +363,7 @@ void FSD_CmpFile::ReadString(TCollection_AsciiString& buffer)
Buffer[0] = '\0';
//myStream.get(Buffer,8192,'\n');
myStream.getline(Buffer,8192,'\n');
for (Standard_Integer lv = (strlen(Buffer)- 1); lv > 1 && (Buffer[lv] == '\r' || Buffer[lv] == '\n') ;lv--) {
for (Standard_Size lv = (strlen(Buffer)- 1); lv > 1 && (Buffer[lv] == '\r' || Buffer[lv] == '\n') ;lv--) {
Buffer[lv] = '\0';
}
bpos = Buffer;
@@ -792,7 +792,7 @@ Storage_Error FSD_CmpFile::BeginReadInfoSection()
{
Storage_Error s;
TCollection_AsciiString l;
Standard_Integer len = strlen(FSD_CmpFile::MagicNumber());
Standard_Size len = strlen(FSD_CmpFile::MagicNumber());
ReadChar(l,len);

2
src/FSD/FSD_File.cdl
View File

@@ -328,7 +328,7 @@ is
WriteExtendedLine(me : in out; buffer : ExtendedString from TCollection) is protected;
---Purpose: write from the current position to the end of line.
ReadChar(me : in out; buffer : in out AsciiString from TCollection; rsize : Integer from Standard) is protected;
ReadChar(me : in out; buffer : in out AsciiString from TCollection; rsize : Size from Standard) is protected;
---Purpose: read <rsize> character from the current position.
ReadString(me : in out; buffer : in out AsciiString from TCollection) is protected;

8
src/FSD/FSD_File.cxx
View File

@@ -50,7 +50,7 @@ Storage_Error FSD_File::IsGoodFileType(const TCollection_AsciiString& aName)
if (s == Storage_VSOk) {
TCollection_AsciiString l;
Standard_Integer len = strlen(FSD_File::MagicNumber());
Standard_Size len = strlen(FSD_File::MagicNumber());
f.ReadChar(l,len);
@@ -267,10 +267,10 @@ void FSD_File::ReadExtendedLine(TCollection_ExtendedString& buffer)
//purpose : read <rsize> character from the current position.
//=======================================================================
void FSD_File::ReadChar(TCollection_AsciiString& buffer, const Standard_Integer rsize)
void FSD_File::ReadChar(TCollection_AsciiString& buffer, const Standard_Size rsize)
{
char c;
Standard_Integer ccount = 0;
Standard_Size ccount = 0;
buffer.Clear();
@@ -707,7 +707,7 @@ Storage_Error FSD_File::BeginReadInfoSection()
{
Storage_Error s;
TCollection_AsciiString l;
Standard_Integer len = strlen(FSD_File::MagicNumber());
Standard_Size len = strlen(FSD_File::MagicNumber());
ReadChar(l,len);