Skip to content

Commit 49d58d0

Browse files
committed
noexcept + noreturn in CsConvert
1 parent 11271db commit 49d58d0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/common/CsConvert.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace Firebird {
4040
class CsConvert
4141
{
4242
public:
43-
CsConvert(charset* cs1, charset* cs2)
43+
CsConvert(charset* cs1, charset* cs2) noexcept
4444
: charSet1(cs1),
4545
charSet2(cs2),
4646
cnvt1((cs1 ? &cs1->charset_to_unicode : NULL)),
@@ -56,7 +56,7 @@ class CsConvert
5656
}
5757
}
5858

59-
CsConvert(const CsConvert& obj)
59+
CsConvert(const CsConvert& obj) noexcept
6060
: charSet1(obj.charSet1),
6161
charSet2(obj.charSet2),
6262
cnvt1(obj.cnvt1),
@@ -259,9 +259,9 @@ class CsConvert
259259
return len;
260260
}
261261

262-
const char* getName() const { return cnvt1->csconvert_name; }
262+
const char* getName() const noexcept { return cnvt1->csconvert_name; }
263263

264-
csconvert* getStruct() const { return cnvt1; }
264+
csconvert* getStruct() const noexcept { return cnvt1; }
265265

266266
private:
267267
charset* charSet1;
@@ -270,13 +270,13 @@ class CsConvert
270270
csconvert* cnvt2;
271271

272272
private:
273-
void raiseError(ISC_STATUS code)
273+
[[noreturn]] void raiseError(ISC_STATUS code)
274274
{
275275
Firebird::status_exception::raise(Firebird::Arg::Gds(isc_arith_except) <<
276276
Firebird::Arg::Gds(code));
277277
}
278278

279-
void raiseError(ULONG dstLen, ULONG srcLen)
279+
[[noreturn]] void raiseError(ULONG dstLen, ULONG srcLen)
280280
{
281281
Firebird::status_exception::raise(Firebird::Arg::Gds(isc_arith_except) <<
282282
Firebird::Arg::Gds(isc_string_truncation) <<

0 commit comments

Comments
 (0)