Skip to content

Commit

Permalink
Compilation fixes
Browse files Browse the repository at this point in the history
for non-msvc compilers
  • Loading branch information
sirjuddington committed Mar 23, 2024
1 parent 3235e73 commit e5d057f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/MainEditor/UI/TextureXEditor/TextureXEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class TextureXEditor : public wxPanel
PatchTable patch_table_; // The patch table for TEXTURE1/2 (ie PNAMES)
vector<TextureXPanel*> texture_editors_; // One panel per TEXTUREX list (ie TEXTURE1/TEXTURE2)
PatchBrowser* patch_browser_ = nullptr; // The patch browser window
unique_ptr<UndoManager> undo_manager_ = nullptr;
unique_ptr<UndoManager> undo_manager_;

// UI Stuff
TabControl* tabs_ = nullptr;
Expand Down
5 changes: 5 additions & 0 deletions src/MapEditor/MapEditContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ MapEditContext::MapEditContext() :
undo_manager_ = std::make_unique<UndoManager>(map_.get());
}

// -----------------------------------------------------------------------------
// MapEditContext class destructor
// -----------------------------------------------------------------------------
MapEditContext::~MapEditContext() = default;

// -----------------------------------------------------------------------------
// Changes the current edit mode to [mode]
// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/MapEditor/MapEditContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class MapEditContext : public SActionHandler
};

MapEditContext();
~MapEditContext() override = default;
~MapEditContext() override;

SLADEMap& map() const { return *map_; }
Mode editMode() const { return edit_mode_; }
Expand Down
5 changes: 5 additions & 0 deletions src/SLADEMap/MapObject/MapSector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ MapSector::MapSector(string_view f_tex, string_view c_tex, const ParseTreeNode*
}
}

// -----------------------------------------------------------------------------
// MapSector class destructor
// -----------------------------------------------------------------------------
MapSector::~MapSector() = default;

// -----------------------------------------------------------------------------
// Copies another map object [s]
// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/SLADEMap/MapObject/MapSector.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class MapSector : public MapObject
short special = 0,
short id = 0);
MapSector(string_view f_tex, string_view c_tex, const ParseTreeNode* udmf_def);
~MapSector() override = default;
~MapSector() override;

void copy(MapObject* obj) override;

Expand Down

0 comments on commit e5d057f

Please sign in to comment.