File tree Expand file tree Collapse file tree 2 files changed +8
-18
lines changed Expand file tree Collapse file tree 2 files changed +8
-18
lines changed Original file line number Diff line number Diff line change @@ -418,20 +418,15 @@ class USASCIICharsetDecoder : public CharsetDecoder
418
418
};
419
419
420
420
/* *
421
- * Charset decoder that uses an embedded CharsetDecoder consistent
422
- * with current locale settings.
421
+ * Charset decoder that uses current locale settings.
423
422
*/
424
423
class LocaleCharsetDecoder : public CharsetDecoder
425
424
{
426
425
public:
427
426
LocaleCharsetDecoder () : state()
428
427
{
429
428
}
430
- virtual ~LocaleCharsetDecoder ()
431
- {
432
- }
433
- virtual log4cxx_status_t decode (ByteBuffer& in,
434
- LogString& out)
429
+ log4cxx_status_t decode (ByteBuffer& in, LogString& out) override
435
430
{
436
431
log4cxx_status_t result = APR_SUCCESS;
437
432
const char * p = in.current ();
@@ -447,7 +442,6 @@ class LocaleCharsetDecoder : public CharsetDecoder
447
442
}
448
443
}
449
444
#endif
450
-
451
445
// Decode characters that may be represented by multiple bytes
452
446
while (0 < remain)
453
447
{
Original file line number Diff line number Diff line change @@ -446,21 +446,19 @@ class UTF16LECharsetEncoder : public CharsetEncoder
446
446
};
447
447
448
448
/* *
449
- * Charset encoder that uses an embedded CharsetEncoder consistent
450
- * with current locale settings.
449
+ * Charset encoder that uses current locale settings.
451
450
*/
452
451
class LocaleCharsetEncoder : public CharsetEncoder
453
452
{
454
453
public:
455
454
LocaleCharsetEncoder () : state()
456
455
{
457
456
}
458
- virtual ~LocaleCharsetEncoder ()
459
- {
460
- }
461
- virtual log4cxx_status_t encode (const LogString& in,
462
- LogString::const_iterator& iter,
463
- ByteBuffer& out)
457
+ log4cxx_status_t encode
458
+ ( const LogString& in
459
+ , LogString::const_iterator& iter
460
+ , ByteBuffer& out
461
+ ) override
464
462
{
465
463
log4cxx_status_t result = APR_SUCCESS;
466
464
#if !LOG4CXX_CHARSET_EBCDIC
@@ -495,8 +493,6 @@ class LocaleCharsetEncoder : public CharsetEncoder
495
493
}
496
494
497
495
private:
498
- LocaleCharsetEncoder (const LocaleCharsetEncoder&);
499
- LocaleCharsetEncoder& operator =(const LocaleCharsetEncoder&);
500
496
std::mbstate_t state;
501
497
};
502
498
You can’t perform that action at this time.
0 commit comments