Skip to content

Commit d91e879

Browse files
committed
Remove outdated #pragma warning
1 parent 22b71eb commit d91e879

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

src/image-to-tiles.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
#include "tile.h"
2121
#include "main-window.h"
2222

23-
// Avoid "warning C4458: declaration of 'i' hides class member"
24-
// due to Fl_Window's Fl_X *i
25-
#pragma warning(push)
26-
#pragma warning(disable : 4458)
27-
2823
typedef std::set<Fl_Color> Color_Set;
2924

3025
static bool build_tilemap(const Tile *tiles, size_t n, const std::vector<int> tile_palettes, Tilemap &tilemap, std::vector<size_t> &tileset,
@@ -454,5 +449,3 @@ Image_to_Tiles_Result Main_Window::image_to_tiles() {
454449
output.success = true;
455450
return output;
456451
}
457-
458-
#pragma warning(pop)

src/main-window.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
#include "app-icon.xpm"
3838
#endif
3939

40-
// Avoid "warning C4458: declaration of 'i' hides class member"
41-
// due to Fl_Window's Fl_X *i
42-
#pragma warning(push)
43-
#pragma warning(disable : 4458)
44-
4540
Main_Window::Main_Window(int x, int y, int w, int h, const char *) : Fl_Overlay_Window(x, y, w, h, PROGRAM_NAME),
4641
_tile_buttons(), _tilemap_file(), _attrmap_file(), _tilemap_basename(), _tileset_files(), _recent_tilemaps(),
4742
_recent_tilesets(), _tilemap(), _tilesets(), _wx(x), _wy(y), _ww(w), _wh(h) {
@@ -2955,5 +2950,3 @@ void Main_Window::change_tile_cb(Tile_Tessera *tt, Main_Window *mw) {
29552950
tt->redraw();
29562951
}
29572952
}
2958-
2959-
#pragma warning(pop)

src/palette-format.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
#include "image.h"
1010
#include "option-dialogs.h"
1111

12-
// Avoid "warning C4458: declaration of 'i' hides class member"
13-
// due to Fl_Window's Fl_X *i
14-
#pragma warning(push)
15-
#pragma warning(disable : 4458)
16-
1712
static const char *palette_names[NUM_PALETTE_FORMATS] = {
1813
"Indexed in tileset image",
1914
"Pixel image (PNG)",
@@ -389,5 +384,3 @@ bool write_tilepal(const char *f, const std::vector<size_t> &tileset, const std:
389384
fclose(file);
390385
return true;
391386
}
392-
393-
#pragma warning(pop)

0 commit comments

Comments
 (0)