Rearranged some headers in sgconfig.

[stg.git] / include / stg / service_conf.h

diff --git a/include/stg/service_conf.h b/include/stg/service_conf.h
index 5f015d0b4fe05429ec6279712696c1d82397f915..ca58154b2a08d53612b64f6419f4f6e4cdbcfa6b 100644 (file)
--- a/include/stg/service_conf.h
+++ b/include/stg/service_conf.h
@@ -3,6 +3,8 @@
 
 #include <string>
 
 
 #include <string>
 

+#include "os_int.h"
+

 struct SERVICE_CONF
 {
 SERVICE_CONF()
 struct SERVICE_CONF
 {
 SERVICE_CONF()


@@ -15,17 +17,17 @@ SERVICE_CONF(const std::string & n, double c)
     : name(n), comment(), cost(c), payDay(0)
 {}
 SERVICE_CONF(const std::string & n, double c, unsigned p)
     : name(n), comment(), cost(c), payDay(0)
 {}
 SERVICE_CONF(const std::string & n, double c, unsigned p)

-    : name(n), comment(), cost(c), payDay(p)
+    : name(n), comment(), cost(c), payDay(static_cast<uint8_t>(p))

 {}
 SERVICE_CONF(const std::string & n, double c,
              unsigned p, const std::string & com)
 {}
 SERVICE_CONF(const std::string & n, double c,
              unsigned p, const std::string & com)

-    : name(n), comment(com), cost(c), payDay(p)
+    : name(n), comment(com), cost(c), payDay(static_cast<uint8_t>(p))

 {}
 
 std::string name;
 std::string comment;
 double      cost;
 {}
 
 std::string name;
 std::string comment;
 double      cost;

-unsigned    payDay;
+uint8_t     payDay;

 };
 
 inline
 };
 
 inline