Skip to content

Commit 4e6f1a3

Browse files
author
Sven Sandberg
committed
BUG#36381815 step 4.1: Update readme file and header guard in mysql_utils, after step 4
Part of: Bug#36381815: Factor out generic functionality from the mysql_binlog_event library Update the readme file for the mysql_utils library after the previous step. Fix the header guard name in nodiscard.h. (We don't squash this into step 3, in order to keep step e reproducible with scripts.) Change-Id: I0e56500b32fe6a7ce91df1c1997c82e8b6e654e6
1 parent 60f2cf6 commit 4e6f1a3

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

libs/mysql/utils/nodiscard.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
along with this program; if not, write to the Free Software
2222
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
2323

24-
#ifndef MYSQL_BINLOG_UTILS_NODISCARD_H
25-
#define MYSQL_BINLOG_UTILS_NODISCARD_H
24+
#ifndef MYSQL_UTILS_NODISCARD_H
25+
#define MYSQL_UTILS_NODISCARD_H
2626

2727
/// The function attribute [[NODISCARD]] is a replacement for
2828
/// [[nodiscard]] to workaround a gcc bug.
@@ -47,4 +47,4 @@
4747
#define NODISCARD nodiscard
4848
#endif
4949

50-
#endif // MYSQL_BINLOG_UTILS_NODISCARD_H
50+
#endif // MYSQL_UTILS_NODISCARD_H

libs/mysql/utils/readme.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@ Code documentation: @ref GroupLibsMysqlUtils.
3535

3636
This is a header-only library, containing various utility functions, such as:
3737

38-
- macro deprecating a header
39-
- definition of Error - base class for (C++) error handling
40-
- enumeration utilities: to_underlying (-std=C++<23>), to_enumeration
41-
- template utilities: Is_specialization
42-
- bit operations
38+
- bounded_arithmetic.h: multiplication and addition, capped at a max value
39+
- concat.h: vararg function to concatenate many values to a string
40+
- deprecate_header.h: macro deprecating a header
41+
- enumeration_utils.h: to_underlying (backported from C++23), to_enumeration
42+
- error.h: definition of Error - base class for (C++) error handling
43+
- is_specialization.h: utility to determine if a template is a specialization
44+
of another.
45+
- nodiscard.h: replacement for [[nodiscard]] that works around gcc bug
46+
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84476
47+
- return_status.h: enum { ok, error }

0 commit comments

Comments
 (0)