Skip to content

Commit

Permalink
Remove outdated #pragma warning
Browse files Browse the repository at this point in the history
  • Loading branch information
dannye committed Nov 16, 2024
1 parent 22b71eb commit d91e879
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 21 deletions.
7 changes: 0 additions & 7 deletions src/image-to-tiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
#include "tile.h"
#include "main-window.h"

// Avoid "warning C4458: declaration of 'i' hides class member"
// due to Fl_Window's Fl_X *i
#pragma warning(push)
#pragma warning(disable : 4458)

typedef std::set<Fl_Color> Color_Set;

static bool build_tilemap(const Tile *tiles, size_t n, const std::vector<int> tile_palettes, Tilemap &tilemap, std::vector<size_t> &tileset,
Expand Down Expand Up @@ -454,5 +449,3 @@ Image_to_Tiles_Result Main_Window::image_to_tiles() {
output.success = true;
return output;
}

#pragma warning(pop)
7 changes: 0 additions & 7 deletions src/main-window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
#include "app-icon.xpm"
#endif

// Avoid "warning C4458: declaration of 'i' hides class member"
// due to Fl_Window's Fl_X *i
#pragma warning(push)
#pragma warning(disable : 4458)

Main_Window::Main_Window(int x, int y, int w, int h, const char *) : Fl_Overlay_Window(x, y, w, h, PROGRAM_NAME),
_tile_buttons(), _tilemap_file(), _attrmap_file(), _tilemap_basename(), _tileset_files(), _recent_tilemaps(),
_recent_tilesets(), _tilemap(), _tilesets(), _wx(x), _wy(y), _ww(w), _wh(h) {
Expand Down Expand Up @@ -2955,5 +2950,3 @@ void Main_Window::change_tile_cb(Tile_Tessera *tt, Main_Window *mw) {
tt->redraw();
}
}

#pragma warning(pop)
7 changes: 0 additions & 7 deletions src/palette-format.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
#include "image.h"
#include "option-dialogs.h"

// Avoid "warning C4458: declaration of 'i' hides class member"
// due to Fl_Window's Fl_X *i
#pragma warning(push)
#pragma warning(disable : 4458)

static const char *palette_names[NUM_PALETTE_FORMATS] = {
"Indexed in tileset image",
"Pixel image (PNG)",
Expand Down Expand Up @@ -389,5 +384,3 @@ bool write_tilepal(const char *f, const std::vector<size_t> &tileset, const std:
fclose(file);
return true;
}

#pragma warning(pop)

0 comments on commit d91e879

Please sign in to comment.