Skip to content

Commit 71a9934

Browse files
committed
Fix up class description
1 parent 2823dfe commit 71a9934

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

src/main/cpp/charsetdecoder.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -418,20 +418,15 @@ class USASCIICharsetDecoder : public CharsetDecoder
418418
};
419419

420420
/**
421-
* Charset decoder that uses an embedded CharsetDecoder consistent
422-
* with current locale settings.
421+
* Charset decoder that uses current locale settings.
423422
*/
424423
class LocaleCharsetDecoder : public CharsetDecoder
425424
{
426425
public:
427426
LocaleCharsetDecoder() : state()
428427
{
429428
}
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
435430
{
436431
log4cxx_status_t result = APR_SUCCESS;
437432
const char* p = in.current();
@@ -447,7 +442,6 @@ class LocaleCharsetDecoder : public CharsetDecoder
447442
}
448443
}
449444
#endif
450-
451445
// Decode characters that may be represented by multiple bytes
452446
while (0 < remain)
453447
{

src/main/cpp/charsetencoder.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -446,21 +446,19 @@ class UTF16LECharsetEncoder : public CharsetEncoder
446446
};
447447

448448
/**
449-
* Charset encoder that uses an embedded CharsetEncoder consistent
450-
* with current locale settings.
449+
* Charset encoder that uses current locale settings.
451450
*/
452451
class LocaleCharsetEncoder : public CharsetEncoder
453452
{
454453
public:
455454
LocaleCharsetEncoder() : state()
456455
{
457456
}
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
464462
{
465463
log4cxx_status_t result = APR_SUCCESS;
466464
#if !LOG4CXX_CHARSET_EBCDIC
@@ -495,8 +493,6 @@ class LocaleCharsetEncoder : public CharsetEncoder
495493
}
496494

497495
private:
498-
LocaleCharsetEncoder(const LocaleCharsetEncoder&);
499-
LocaleCharsetEncoder& operator=(const LocaleCharsetEncoder&);
500496
std::mbstate_t state;
501497
};
502498

0 commit comments

Comments
 (0)