Add an option to opt-out Firebird store.

[stg.git] / projects / sgconf / utils.h

diff --git a/projects/sgconf/utils.h b/projects/sgconf/utils.h
index 2e16b625ab91927942e21070614fe4aa088811d6..3a57d9995f9f5b74c437703f65f73741f4aea2b0 100644 (file)
--- a/projects/sgconf/utils.h
+++ b/projects/sgconf/utils.h
@@ -1,48 +1,45 @@
-#ifndef __STG_SGCONF_UTILS_H__
-#define __STG_SGCONF_UTILS_H__
+#pragma once

 
 #include "stg/common.h"
 
 #include "stg/common.h"

-#include "stg/resetable.h"

 
 #include <string>
 #include <map>
 
 #include <string>
 #include <map>

+#include <optional>

 
 namespace SGCONF
 {
 
 template <typename T>
 inline
 
 namespace SGCONF
 {
 
 template <typename T>
 inline

-void MaybeSet(const std::map<std::string, std::string> & options, const std::string & name, RESETABLE<T> & res)
+void MaybeSet(const std::map<std::string, std::string> & options, const std::string & name, std::optional<T> & res)

 {
 {

-std::map<std::string, std::string>::const_iterator it(options.find(name));
-if (it == options.end())
-    return;
-T value;
-if (str2x(it->second, value) < 0)
-    return;
-res = value;
+    std::map<std::string, std::string>::const_iterator it(options.find(name));
+    if (it == options.end())
+        return;
+    T value;
+    if (str2x(it->second, value) < 0)
+        return;
+    res = value;

 }
 
 template <typename T, typename F>
 inline
 }
 
 template <typename T, typename F>
 inline

-void MaybeSet(const std::map<std::string, std::string> & options, const std::string & name, RESETABLE<T> & res, F conv)
+void MaybeSet(const std::map<std::string, std::string> & options, const std::string & name, T & res, F conv)

 {
 {

-std::map<std::string, std::string>::const_iterator it(options.find(name));
-if (it == options.end())
-    return;
-conv(it->second, res);
+    std::map<std::string, std::string>::const_iterator it(options.find(name));
+    if (it == options.end())
+        return;
+    conv(it->second, res);

 }
 
 template <>
 inline
 }
 
 template <>
 inline

-void MaybeSet<std::string>(const std::map<std::string, std::string> & options, const std::string & name, RESETABLE<std::string> & res)
+void MaybeSet<std::string>(const std::map<std::string, std::string> & options, const std::string & name, std::optional<std::string> & res)

 {
 {

-std::map<std::string, std::string>::const_iterator it(options.find(name));
-if (it == options.end())
-    return;
-res = it->second;
+    std::map<std::string, std::string>::const_iterator it(options.find(name));
+    if (it == options.end())
+        return;
+    res = it->second;

 }
 
 } // namespace SGCONF
 }
 
 } // namespace SGCONF

-
-#endif