Simplify using magic_enum

TLCFEM · Nov 15, 2024 · 2431e53 · 2431e53
1 parent 8b321a8
commit 2431e53
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/Include/magic_enum/magic_enum.hpp b/Include/magic_enum/magic_enum.hpp
@@ -5,7 +5,7 @@
 // | |  | | (_| | (_| | | (__  | |____| | | | |_| | | | | | | | |____|_|   |_|
 // |_|  |_|\__,_|\__, |_|\___| |______|_| |_|\__,_|_| |_| |_|  \_____|
 //                __/ | https://github.com/Neargye/magic_enum
-//               |___/  version 0.9.6
+//               |___/  version 0.9.7
 //
 // Licensed under the MIT License <http://opensource.org/licenses/MIT>.
 // SPDX-License-Identifier: MIT
@@ -34,7 +34,7 @@
 
 #define MAGIC_ENUM_VERSION_MAJOR 0
 #define MAGIC_ENUM_VERSION_MINOR 9
-#define MAGIC_ENUM_VERSION_PATCH 6
+#define MAGIC_ENUM_VERSION_PATCH 7
 
 #ifndef MAGIC_ENUM_USE_STD_MODULE
 #include <array>

diff --git a/README.md b/README.md
@@ -302,6 +302,7 @@ Additional libraries used in **suanPan** are listed as follows.
 - [**fmt**](https://github.com/fmtlib/fmt) version 10.2.1
 - [**whereami**](https://github.com/gpakosz/whereami)
 - [**exprtk**](https://github.com/ArashPartow/exprtk)
+- [**magic_enum**](https://github.com/Neargye/magic_enum) version 0.9.7
 - **thread_pool** abridged version of [`thread-pool`](https://github.com/bshoshany/thread-pool)
 
 Those libraries may depend on other libraries such as [zlib](https://zlib.net/)

diff --git a/Recorder/OutputType.cpp b/Recorder/OutputType.cpp
@@ -16,10 +16,6 @@
  ******************************************************************************/
 
 #include "OutputType.h"
-#include <Toolbox/utility.h>
-
-
-OutputType to_token(const std::string& L) { return to_token(L.c_str()); }
 
 int to_index(const OutputType config) {
     if(config == OutputType::S11) return 0;

diff --git a/Recorder/OutputType.h b/Recorder/OutputType.h
@@ -18,7 +18,6 @@
 #ifndef OUTPUTTYPE_H
 #define OUTPUTTYPE_H
 
-#include <string>
 #include <magic_enum/magic_enum.hpp>
 
 enum class OutputType {
@@ -259,17 +258,17 @@ enum class OutputType {
 
     // amplitude
     AMP,
-    NL = 256
+    NL
 };
 
 template<> struct magic_enum::customize::enum_range<OutputType> {
     static constexpr int min = 0;
     static constexpr int max = 512;
 };
 
-constexpr std::string_view to_name(OutputType L) { return magic_enum::enum_name(L);}
-constexpr OutputType to_token(const char* L) { return magic_enum::enum_cast<OutputType>(L).value_or(OutputType::NL);}
-OutputType to_token(const std::string&);
+constexpr std::string_view to_name(OutputType L) { return magic_enum::enum_name(L); }
+
+constexpr OutputType to_token(std::string_view L) { return magic_enum::enum_cast<OutputType>(L).value_or(OutputType::NL); }
 
 const char* to_category(OutputType);
 int to_index(OutputType);