Public interfaces: part 3

[stg.git] / sgconf / utils.h

diff --git a/sgconf/utils.h b/sgconf/utils.h
index 3793c9cd4f2415dd215cc26fce2dd3b4cf01efcf..6168cbf2f111354fb44969bacc250e8485e6d7dc 100644 (file)
--- a/sgconf/utils.h
+++ b/sgconf/utils.h
@@ -1,8 +1,7 @@
-#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 "stg/optional.h"

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


@@ -12,7 +11,7 @@ namespace SGCONF
 
 template <typename T>
 inline
 
 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, STG::Optional<T> & res)

 {
 std::map<std::string, std::string>::const_iterator it(options.find(name));
 if (it == options.end())
 {
 std::map<std::string, std::string>::const_iterator it(options.find(name));
 if (it == options.end())


@@ -35,7 +34,7 @@ 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, STG::Optional<std::string> & res)

 {
 std::map<std::string, std::string>::const_iterator it(options.find(name));
 if (it == options.end())
 {
 std::map<std::string, std::string>::const_iterator it(options.find(name));
 if (it == options.end())


@@ -44,5 +43,3 @@ res = it->second;
 }
 
 } // namespace SGCONF
 }
 
 } // namespace SGCONF

-
-#endif