firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 15:23:02 +01:00
Code Issues

Fixed CORE-5359: MessageMetadata's getScale returns int and MetadataBuilder's setScale want unsigned

Browse Source
This commit is contained in:
AlexPeshkoff 2016-10-12 17:45:33 +03:00
parent a0a2495b40
commit 7a4296561c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/MsgMetadata.cpp
View File

@ -129,7 +129,7 @@ void MetadataBuilder::setCharSet(CheckStatusWrapper* status, unsigned index, uns
}
}
void MetadataBuilder::setScale(CheckStatusWrapper* status, unsigned index, unsigned scale)
void MetadataBuilder::setScale(CheckStatusWrapper* status, unsigned index, int scale)
{
try
{

2
src/common/MsgMetadata.h
View File

@ -312,7 +312,7 @@ public:
void setSubType(CheckStatusWrapper* status, unsigned index, int subType);
void setLength(CheckStatusWrapper* status, unsigned index, unsigned length);
void setCharSet(CheckStatusWrapper* status, unsigned index, unsigned charSet);
void setScale(CheckStatusWrapper* status, unsigned index, unsigned scale);
void setScale(CheckStatusWrapper* status, unsigned index, int scale);
void truncate(CheckStatusWrapper* status, unsigned count);
void remove(CheckStatusWrapper* status, unsigned index);
void moveNameToIndex(CheckStatusWrapper* status, const char* name, unsigned index);

2
src/include/firebird/FirebirdInterface.idl
View File

@ -370,7 +370,7 @@ interface MetadataBuilder : ReferenceCounted
void setSubType(Status status, uint index, int subType);
void setLength(Status status, uint index, uint length);
void setCharSet(Status status, uint index, uint charSet);
void setScale(Status status, uint index, uint scale);
void setScale(Status status, uint index, int scale);
void truncate(Status status, uint count);
void moveNameToIndex(Status status, const string name, uint index);

8
src/include/firebird/IdlFbInterfaces.h
View File

@ -1328,7 +1328,7 @@ namespace Firebird
void (CLOOP_CARG *setSubType)(IMetadataBuilder* self, IStatus* status, unsigned index, int subType) throw();
void (CLOOP_CARG *setLength)(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned length) throw();
void (CLOOP_CARG *setCharSet)(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned charSet) throw();
void (CLOOP_CARG *setScale)(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned scale) throw();
void (CLOOP_CARG *setScale)(IMetadataBuilder* self, IStatus* status, unsigned index, int scale) throw();
void (CLOOP_CARG *truncate)(IMetadataBuilder* self, IStatus* status, unsigned count) throw();
void (CLOOP_CARG *moveNameToIndex)(IMetadataBuilder* self, IStatus* status, const char* name, unsigned index) throw();
void (CLOOP_CARG *remove)(IMetadataBuilder* self, IStatus* status, unsigned index) throw();
@ -1377,7 +1377,7 @@ namespace Firebird
StatusType::checkException(status);
}
template <typename StatusType> void setScale(StatusType* status, unsigned index, unsigned scale)
template <typename StatusType> void setScale(StatusType* status, unsigned index, int scale)
{
StatusType::clearException(status);
static_cast<VTable*>(this->cloopVTable)->setScale(this, status, index, scale);
@ -7729,7 +7729,7 @@ namespace Firebird
}
}
static void CLOOP_CARG cloopsetScaleDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, unsigned scale) throw()
static void CLOOP_CARG cloopsetScaleDispatcher(IMetadataBuilder* self, IStatus* status, unsigned index, int scale) throw()
{
StatusType status2(status);
@ -7858,7 +7858,7 @@ namespace Firebird
virtual void setSubType(StatusType* status, unsigned index, int subType) = 0;
virtual void setLength(StatusType* status, unsigned index, unsigned length) = 0;
virtual void setCharSet(StatusType* status, unsigned index, unsigned charSet) = 0;
virtual void setScale(StatusType* status, unsigned index, unsigned scale) = 0;
virtual void setScale(StatusType* status, unsigned index, int scale) = 0;
virtual void truncate(StatusType* status, unsigned count) = 0;
virtual void moveNameToIndex(StatusType* status, const char* name, unsigned index) = 0;
virtual void remove(StatusType* status, unsigned index) = 0;