8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 21:23:03 +01:00

Fix problem verified by Claudio

This commit is contained in:
asfernandes 2009-09-06 15:42:15 +00:00
parent 2396749b1f
commit 9902dfc555

View File

@ -2632,8 +2632,8 @@ namespace
class CommonCallbacks : public Callbacks
{
public:
CommonCallbacks()
: Callbacks(localError)
explicit CommonCallbacks(ErrorFunction aErr)
: Callbacks(aErr)
{
}
@ -2646,13 +2646,8 @@ namespace
const USHORT to_size);
virtual SLONG getCurDate();
virtual void isVersion4(bool& v4);
public:
static CommonCallbacks instance;
};
CommonCallbacks CommonCallbacks::instance;
bool CommonCallbacks::transliterate(const dsc*, dsc* to, CHARSET_ID& charset2)
{
charset2 = INTL_TTYPE(to);
@ -2700,5 +2695,6 @@ void CVT_move(const dsc* from, dsc* to, ErrorFunction err)
* Move (and possible convert) something to something else.
*
**************************************/
CVT_move_common(from, to, &CommonCallbacks::instance);
CommonCallbacks callbacks(err);
CVT_move_common(from, to, &callbacks);
}