DataTypeUtil.h (Firebird-3.0.2.32703-0.tar.bz2) | : | DataTypeUtil.h (Firebird-3.0.4.33054-0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 32 | skipping to change at line 32 | |||
* | * | |||
* All Rights Reserved. | * All Rights Reserved. | |||
* Contributor(s): ______________________________________. | * Contributor(s): ______________________________________. | |||
*/ | */ | |||
#ifndef JRD_DATATYPEUTIL_H | #ifndef JRD_DATATYPEUTIL_H | |||
#define JRD_DATATYPEUTIL_H | #define JRD_DATATYPEUTIL_H | |||
#include "../intl/charsets.h" | #include "../intl/charsets.h" | |||
#include "../common/classes/fb_string.h" | #include "../common/classes/fb_string.h" | |||
#include "../jrd/err_proto.h" | ||||
struct dsc; | struct dsc; | |||
class DataTypeUtilBase | class DataTypeUtilBase | |||
{ | { | |||
public: | public: | |||
virtual ~DataTypeUtilBase() {} | virtual ~DataTypeUtilBase() {} | |||
public: | public: | |||
static SSHORT getResultBlobSubType(const dsc* value1, const dsc* value2); | static SSHORT getResultBlobSubType(const dsc* value1, const dsc* value2); | |||
skipping to change at line 80 | skipping to change at line 81 | |||
: tdbb(original_tdbb) | : tdbb(original_tdbb) | |||
{ | { | |||
} | } | |||
public: | public: | |||
virtual UCHAR maxBytesPerChar(UCHAR charSet); | virtual UCHAR maxBytesPerChar(UCHAR charSet); | |||
virtual USHORT getDialect() const; | virtual USHORT getDialect() const; | |||
public: | public: | |||
static bool convertToUTF8(const Firebird::string& src, Firebird::string& dst, | static bool convertToUTF8(const Firebird::string& src, Firebird::string& dst, | |||
CHARSET_ID charset = CS_dynamic); | CHARSET_ID charset = CS_dynamic, ErrorFunction err = ERR_post); | |||
private: | private: | |||
thread_db* tdbb; | thread_db* tdbb; | |||
}; | }; | |||
} // namespace Jrd | } // namespace Jrd | |||
#endif // JRD_DATATYPEUTIL_H | #endif // JRD_DATATYPEUTIL_H | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |