[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 040e7c0 2/3: Add explicitly-deleted copy fns
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 040e7c0 2/3: Add explicitly-deleted copy fns for classes with ptr members |
Date: |
Wed, 8 Mar 2017 21:58:21 -0500 (EST) |
branch: master
commit 040e7c090ace375d5668f0a5701608d8cc0a1eb1
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Add explicitly-deleted copy fns for classes with ptr members
See:
http://lists.nongnu.org/archive/html/lmi/2017-03/msg00055.html
---
census_view.cpp | 5 +++++
getopt.hpp | 3 ++-
input_sequence_entry.cpp | 2 ++
input_sequence_entry.hpp | 2 ++
rate_table.cpp | 3 +++
rounding_view_editor.hpp | 2 ++
wx_test_calculation_summary.cpp | 3 +++
wx_test_input_validation.cpp | 3 +++
8 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/census_view.cpp b/census_view.cpp
index e0e2780..b17140b 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -351,6 +351,9 @@ struct input_sequence_variant_data
{
}
+ input_sequence_variant_data(input_sequence_variant_data const&) = delete;
+ input_sequence_variant_data& operator=(input_sequence_variant_data const&)
= delete;
+
bool Eq(wxVariantData& data) const override
{
input_sequence_variant_data* d =
dynamic_cast<input_sequence_variant_data*>(&data);
@@ -376,6 +379,8 @@ class DatumSequenceRenderer
{
public:
DatumSequenceRenderer();
+ DatumSequenceRenderer(DatumSequenceRenderer const&) = delete;
+ DatumSequenceRenderer& operator=(DatumSequenceRenderer const&) = delete;
bool HasEditorCtrl() const override { return true; }
wxWindow* CreateEditorCtrl(wxWindow* parent, wxRect labelRect, wxVariant
const& value) override;
bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant& value) override;
diff --git a/getopt.hpp b/getopt.hpp
index b549f07..cc5fe50 100644
--- a/getopt.hpp
+++ b/getopt.hpp
@@ -315,7 +315,8 @@ class LMI_SO GetOpt
GetOpt(int argc, char** argv, char const* optstring);
GetOpt(int argc, char** argv, char const* optstring,
Option const* longopts, int* longind, int long_only);
-
+ GetOpt(GetOpt const&) = delete;
+ GetOpt& operator=(GetOpt const&) = delete;
~GetOpt() = default; // Added by GWC.
int operator()();
diff --git a/input_sequence_entry.cpp b/input_sequence_entry.cpp
index 05197c5..aa23a95 100644
--- a/input_sequence_entry.cpp
+++ b/input_sequence_entry.cpp
@@ -184,6 +184,8 @@ class InputSequenceEditor
{
public:
InputSequenceEditor(wxWindow* parent, wxString const& title, Input const&
input);
+ InputSequenceEditor(InputSequenceEditor const&) = delete;
+ InputSequenceEditor& operator=(InputSequenceEditor const&) = delete;
void set_keywords
(std::vector<std::string> const& keywords
diff --git a/input_sequence_entry.hpp b/input_sequence_entry.hpp
index d8b03ca..77571e7 100644
--- a/input_sequence_entry.hpp
+++ b/input_sequence_entry.hpp
@@ -41,6 +41,8 @@ class InputSequenceEntry
public:
InputSequenceEntry() = default;
InputSequenceEntry(wxWindow* parent, wxWindowID id, wxString const& name);
+ InputSequenceEntry(InputSequenceEntry const&) = delete;
+ InputSequenceEntry& operator=(InputSequenceEntry const&) = delete;
bool Create(wxWindow* parent, wxWindowID id, wxString const& name);
void input(Input const& input);
diff --git a/rate_table.cpp b/rate_table.cpp
index 97d0158..ea38aba 100644
--- a/rate_table.cpp
+++ b/rate_table.cpp
@@ -2889,6 +2889,9 @@ void database_impl::save(fs::path const& path)
if(!ofs_) alarum() << "Unable to open '" << temp_path_ << "'." <<
LMI_FLUSH;
}
+ safe_output_file(safe_output_file const&) = delete;
+ safe_output_file& operator=(safe_output_file const&) = delete;
+
void close()
{
ofs_.close();
diff --git a/rounding_view_editor.hpp b/rounding_view_editor.hpp
index 6705b5d..d15e855 100644
--- a/rounding_view_editor.hpp
+++ b/rounding_view_editor.hpp
@@ -48,6 +48,8 @@ class RoundingButtons
,long style = 0
,std::string const& name = wxPanelNameStr
);
+ RoundingButtons(RoundingButtons const&) = delete;
+ RoundingButtons& operator=(RoundingButtons const&) = delete;
~RoundingButtons() override = default;
void Create
diff --git a/wx_test_calculation_summary.cpp b/wx_test_calculation_summary.cpp
index 5ab7427..e1f6390 100644
--- a/wx_test_calculation_summary.cpp
+++ b/wx_test_calculation_summary.cpp
@@ -92,6 +92,9 @@ class expect_preferences_dialog_base
{
}
+ expect_preferences_dialog_base(expect_preferences_dialog_base const&) =
delete;
+ expect_preferences_dialog_base& operator=(expect_preferences_dialog_base
const&) = delete;
+
void run() const
{
wxUIActionSimulator ui;
diff --git a/wx_test_input_validation.cpp b/wx_test_input_validation.cpp
index aae4af3..78a145f 100644
--- a/wx_test_input_validation.cpp
+++ b/wx_test_input_validation.cpp
@@ -97,6 +97,9 @@ LMI_WX_TEST_CASE(input_validation)
:value_(value)
{}
+ test_coi_multiplier_dialog(test_coi_multiplier_dialog const&) = delete;
+ test_coi_multiplier_dialog& operator=(test_coi_multiplier_dialog
const&) = delete;
+
int OnInvoked(MvcController* dialog) const override
{
dialog->Show();