Backport: Add constexpr, const, noexcept and make other small improvements to lexlib.

Backport of changeset 8416:06a43e06a8e0.

1 files changed, 3 insertions, 5 deletions

diff --git a/lexlib/OptionSet.h b/lexlib/OptionSet.h
index 918eaba4f..3c282e49b 100644
--- a/lexlib/OptionSet.h
+++ b/lexlib/OptionSet.h
@@ -68,7 +68,7 @@ class OptionSet {
 			}
 			return false;
 		}
-		const char *Get() const {
+		const char *Get() const noexcept {
 			return value.c_str();
 		}
 	};
@@ -83,8 +83,6 @@ class OptionSet {
 		names += name;
 	}
 public:
-	virtual ~OptionSet() {
-	}
 	void DefineProperty(const char *name, plcob pb, std::string description="") {
 		nameToDef[name] = Option(pb, description);
 		AppendName(name);
@@ -97,7 +95,7 @@ public:
 		nameToDef[name] = Option(ps, description);
 		AppendName(name);
 	}
-	const char *PropertyNames() const {
+	const char *PropertyNames() const noexcept {
 		return names.c_str();
 	}
 	int PropertyType(const char *name) {
@@ -141,7 +139,7 @@ public:
 		}
 	}
 
-	const char *DescribeWordListSets() const {
+	const char *DescribeWordListSets() const noexcept {
 		return wordLists.c_str();
 	}
 };