diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2020-01-31 15:53:51 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2020-01-31 15:53:51 +0100 |
| commit | 373489f1a64ce8ebf9e18f3fb613118987867c6f (patch) | |
| tree | 042920929c427d23e644280a3480fe67951b5094 | |
| parent | 8edb7b06907de28b25e1c77ec1017d4ca1cc15c7 (diff) | |
Remove constexpr which was causing compilation errors on GCC
The code in question contained a reinterpret_cast which is not allowed
under constexpr.
| -rw-r--r-- | src/main-gtk2.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main-gtk2.cc b/src/main-gtk2.cc index 736a3aa0..f660048f 100644 --- a/src/main-gtk2.cc +++ b/src/main-gtk2.cc @@ -1227,7 +1227,7 @@ namespace { // anonymous using menu_callback = void(gpointer user_data, guint user_action, GtkWidget *widget); -constexpr auto make_menu_item(const char *path, const char *accel, menu_callback callback, guint action, const char *type) +auto make_menu_item(const char *path, const char *accel, menu_callback callback, guint action, const char *type) { return GtkItemFactoryEntry { (gchar *) path, @@ -1239,7 +1239,7 @@ constexpr auto make_menu_item(const char *path, const char *accel, menu_callback }; } -constexpr auto menu_branch(const char *path) +auto menu_branch(const char *path) { return make_menu_item( path, @@ -1249,7 +1249,7 @@ constexpr auto menu_branch(const char *path) "<Branch>"); } -constexpr auto menu_terminal(const char *accel, guint terminal_number) +auto menu_terminal(const char *accel, guint terminal_number) { return make_menu_item( nullptr /* Filled in by setup_menu_paths() */, @@ -1259,7 +1259,7 @@ constexpr auto menu_terminal(const char *accel, guint terminal_number) "<CheckItem>"); } -constexpr auto menu_font(guint terminal_number) +auto menu_font(guint terminal_number) { return make_menu_item( nullptr /* Filled in by setup_menu_paths() */, @@ -1269,7 +1269,7 @@ constexpr auto menu_font(guint terminal_number) nullptr); } -constexpr auto menu_action(const char *path, const char *accel, menu_callback callback) +auto menu_action(const char *path, const char *accel, menu_callback callback) { return make_menu_item( path, @@ -1279,7 +1279,7 @@ constexpr auto menu_action(const char *path, const char *accel, menu_callback ca nullptr); } -constexpr auto menu_check_item(const char *path, const char *accel, menu_callback callback) +auto menu_check_item(const char *path, const char *accel, menu_callback callback) { return make_menu_item( path, |