[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master d9e80e4 2/6: Avoid gratuitous use of boost
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master d9e80e4 2/6: Avoid gratuitous use of boost |
Date: |
Sat, 24 Feb 2018 17:26:45 -0500 (EST) |
branch: master
commit d9e80e4e2453189a5700b9c25adb37e98415249e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Avoid gratuitous use of boost
The convenience of writing '!=' instead of '==' in a single line of
'edit_mvc_docview_parameters.hpp' (and, less importantly, in a couple
unit tests) was not worth the complexity of requiring boost in eight
other headers.
Incidentally removed stray boost filesystem headers in a couple files.
---
datum_boolean.hpp | 3 ---
datum_sequence.hpp | 8 --------
datum_string.hpp | 3 ---
edit_mvc_docview_parameters.hpp | 2 +-
gpt_input.hpp | 3 ---
gpt_state.hpp | 4 ----
input.hpp | 3 ---
input_test.cpp | 4 ++--
mec_input.hpp | 3 ---
mec_state.hpp | 4 ----
10 files changed, 3 insertions(+), 34 deletions(-)
diff --git a/datum_boolean.hpp b/datum_boolean.hpp
index 916e7c4..f9ad6f6 100644
--- a/datum_boolean.hpp
+++ b/datum_boolean.hpp
@@ -26,13 +26,10 @@
#include "datum_base.hpp"
-#include <boost/operators.hpp>
-
// Implicitly-declared special member functions do the right thing.
class datum_boolean
:public datum_base
- ,private boost::equality_comparable<datum_boolean,datum_boolean>
{
public:
explicit datum_boolean(bool = true);
diff --git a/datum_sequence.hpp b/datum_sequence.hpp
index d546f20..c824468 100644
--- a/datum_sequence.hpp
+++ b/datum_sequence.hpp
@@ -28,8 +28,6 @@
#include "value_cast.hpp"
-#include <boost/operators.hpp>
-
#include <map>
#include <string>
@@ -67,7 +65,6 @@
class datum_sequence
:public datum_string
- ,private boost::equality_comparable<datum_sequence,datum_sequence>
{
public:
datum_sequence();
@@ -114,7 +111,6 @@ bool operator==(datum_sequence const&, datum_sequence
const&);
class numeric_sequence
:public datum_sequence
- ,private boost::equality_comparable<numeric_sequence,numeric_sequence>
{
public:
numeric_sequence() = default;
@@ -145,7 +141,6 @@ template<> inline std::string
value_cast<std::string,numeric_sequence>
class payment_sequence
:public datum_sequence
- ,private boost::equality_comparable<payment_sequence,payment_sequence>
{
public:
payment_sequence() = default;
@@ -176,7 +171,6 @@ template<> inline std::string
value_cast<std::string,payment_sequence>
class mode_sequence
:public datum_sequence
- ,private boost::equality_comparable<mode_sequence,mode_sequence>
{
public:
mode_sequence() = default;
@@ -208,7 +202,6 @@ template<> inline std::string
value_cast<std::string,mode_sequence>
class specamt_sequence
:public datum_sequence
- ,private boost::equality_comparable<specamt_sequence,specamt_sequence>
{
public:
specamt_sequence() = default;
@@ -239,7 +232,6 @@ template<> inline std::string
value_cast<std::string,specamt_sequence>
class dbo_sequence
:public datum_sequence
- ,private boost::equality_comparable<dbo_sequence,dbo_sequence>
{
public:
dbo_sequence() = default;
diff --git a/datum_string.hpp b/datum_string.hpp
index 3c5230d..c753b2b 100644
--- a/datum_string.hpp
+++ b/datum_string.hpp
@@ -28,15 +28,12 @@
#include "value_cast.hpp"
-#include <boost/operators.hpp>
-
#include <string>
// Implicitly-declared special member functions do the right thing.
class datum_string
:public datum_base
- ,private boost::equality_comparable<datum_string,datum_string>
{
public:
datum_string() = default;
diff --git a/edit_mvc_docview_parameters.hpp b/edit_mvc_docview_parameters.hpp
index 0013edd..8e584aa 100644
--- a/edit_mvc_docview_parameters.hpp
+++ b/edit_mvc_docview_parameters.hpp
@@ -56,7 +56,7 @@ oenum_mvc_dv_rc edit_mvc_docview_parameters
;
if(wxID_OK == z)
{
- if(parameters != edited_parameters)
+ if(!(parameters == edited_parameters))
{
rc = oe_mvc_dv_changed;
parameters = edited_parameters;
diff --git a/gpt_input.hpp b/gpt_input.hpp
index d9edef8..1482c10 100644
--- a/gpt_input.hpp
+++ b/gpt_input.hpp
@@ -40,8 +40,6 @@
class product_database;
-#include <boost/operators.hpp>
-
#include <memory> // unique_ptr
#include <string>
#include <vector>
@@ -73,7 +71,6 @@ class LMI_SO gpt_input final
:public xml_serializable <gpt_input>
,public MvcModel
,public MemberSymbolTable <gpt_input>
- ,private boost::equality_comparable <gpt_input>
{
friend class Server7702;
diff --git a/gpt_state.hpp b/gpt_state.hpp
index fa887c6..8a20c61 100644
--- a/gpt_state.hpp
+++ b/gpt_state.hpp
@@ -28,9 +28,6 @@
#include "so_attributes.hpp"
#include "xml_serializable.hpp"
-#include <boost/filesystem/path.hpp>
-#include <boost/operators.hpp>
-
#include <string>
/// Transient state of guideline premium test.
@@ -49,7 +46,6 @@
class LMI_SO gpt_state final
:public xml_serializable <gpt_state>
,public MemberSymbolTable <gpt_state>
- ,private boost::equality_comparable <gpt_state>
{
friend class Irc7702A;
diff --git a/input.hpp b/input.hpp
index 75e99ee..b7ef5ea 100644
--- a/input.hpp
+++ b/input.hpp
@@ -40,8 +40,6 @@
class product_database;
-#include <boost/operators.hpp>
-
#include <map>
#include <memory> // unique_ptr
#include <string>
@@ -119,7 +117,6 @@ class LMI_SO Input final
:public xml_serializable <Input>
,public MvcModel
,public MemberSymbolTable <Input>
- ,private boost::equality_comparable <Input>
{
friend class input_test;
friend class yare_input;
diff --git a/input_test.cpp b/input_test.cpp
index d6ec298..a85a47c 100644
--- a/input_test.cpp
+++ b/input_test.cpp
@@ -324,7 +324,7 @@ std::cout << "replica.FundAllocs.size() is " <<
replica.FundAllocs.size() << '\n
Input copy0(original);
BOOST_TEST(original == copy0);
copy0["InsuredName"] = "Claude Proulx";
- BOOST_TEST(original != copy0);
+ BOOST_TEST(!(original == copy0));
BOOST_TEST(std::string("Claude Proulx") == copy0 .InsuredName.value());
BOOST_TEST(std::string("Full Name") == original.InsuredName.value());
@@ -333,7 +333,7 @@ std::cout << "replica.FundAllocs.size() is " <<
replica.FundAllocs.size() << '\n
copy1 = original;
BOOST_TEST(original == copy1);
copy1["InsuredName"] = "Angela";
- BOOST_TEST(original != copy1);
+ BOOST_TEST(!(original == copy1));
BOOST_TEST(std::string("Angela") == copy1 .InsuredName.value());
BOOST_TEST(std::string("Full Name") == original.InsuredName.value());
diff --git a/mec_input.hpp b/mec_input.hpp
index c216d1c..a59a1cd 100644
--- a/mec_input.hpp
+++ b/mec_input.hpp
@@ -40,8 +40,6 @@
class product_database;
-#include <boost/operators.hpp>
-
#include <memory> // unique_ptr
#include <string>
#include <vector>
@@ -66,7 +64,6 @@ class LMI_SO mec_input final
:public xml_serializable <mec_input>
,public MvcModel
,public MemberSymbolTable <mec_input>
- ,private boost::equality_comparable <mec_input>
{
public:
mec_input();
diff --git a/mec_state.hpp b/mec_state.hpp
index 371de66..cb98fc3 100644
--- a/mec_state.hpp
+++ b/mec_state.hpp
@@ -28,9 +28,6 @@
#include "so_attributes.hpp"
#include "xml_serializable.hpp"
-#include <boost/filesystem/path.hpp>
-#include <boost/operators.hpp>
-
#include <string>
/// Transient state of MEC testing.
@@ -45,7 +42,6 @@
class LMI_SO mec_state final
:public xml_serializable <mec_state>
,public MemberSymbolTable <mec_state>
- ,private boost::equality_comparable <mec_state>
{
friend class Irc7702A;
- [lmi-commits] [lmi] master updated (af00582 -> 0c16a43), Greg Chicares, 2018/02/24
- [lmi-commits] [lmi] master 0a40076 1/6: Prefer the C++ standard library to boost, Greg Chicares, 2018/02/24
- [lmi-commits] [lmi] master 45156c8 3/6: Avoid gratuitous use of boost, Greg Chicares, 2018/02/24
- [lmi-commits] [lmi] master d9e80e4 2/6: Avoid gratuitous use of boost,
Greg Chicares <=
- [lmi-commits] [lmi] master 5c6922b 4/6: Replace boost::optional with std::experimental::optional, Greg Chicares, 2018/02/24
- [lmi-commits] [lmi] master 0c16a43 6/6: Replace boost::any with std::experimental::any, Greg Chicares, 2018/02/24
- [lmi-commits] [lmi] master f6760eb 5/6: Prefer explicit 'std::' qualification to using-declarations, Greg Chicares, 2018/02/24