diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-06-11 17:22:56 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-06-11 17:22:56 +0200 |
| commit | c51548d6b4234d1b9bf7548125f63c5975f37d35 (patch) | |
| tree | 5aaa9514d62dcaca3a5580dcc8edd6dbdcad1748 /storage/connect/xobject.cpp | |
| parent | f3452fcd844d6477968c3feb982e30612aa34f4d (diff) | |
| download | mariadb-git-c51548d6b4234d1b9bf7548125f63c5975f37d35.tar.gz | |
Fix unhandled exception:
Force type int for ENUMs.
Replace remaining longjmp.
modified: storage/connect/array.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filter.cpp
modified: storage/connect/jdbconn.cpp
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xobject.cpp
Diffstat (limited to 'storage/connect/xobject.cpp')
| -rw-r--r-- | storage/connect/xobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/xobject.cpp b/storage/connect/xobject.cpp index 6df3cee14bc..eca60561b92 100644 --- a/storage/connect/xobject.cpp +++ b/storage/connect/xobject.cpp @@ -84,7 +84,7 @@ double XOBJECT::GetFloatValue(void) CONSTANT::CONSTANT(PGLOBAL g, void *value, short type) { if (!(Value = AllocateValue(g, value, (int)type))) - throw TYPE_CONST; + throw (int)TYPE_CONST; Constant = true; } // end of CONSTANT constructor @@ -95,7 +95,7 @@ CONSTANT::CONSTANT(PGLOBAL g, void *value, short type) CONSTANT::CONSTANT(PGLOBAL g, int n) { if (!(Value = AllocateValue(g, &n, TYPE_INT))) - throw TYPE_CONST; + throw (int)TYPE_CONST; Constant = true; } // end of CONSTANT constructor @@ -117,7 +117,7 @@ void CONSTANT::Convert(PGLOBAL g, int newtype) { if (Value->GetType() != newtype) if (!(Value = AllocateValue(g, Value, newtype))) - throw TYPE_CONST; + throw (int)TYPE_CONST; } // end of Convert |