From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 21 Jan 2017 19:02:07 +0000 (+0200)
Subject: Merge branch 'stg-2.409' into stg-2.409-radius
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/22cb2560274e05e6490cf964cbbeb74a1991c642?ds=sidebyside;hp=--cc

Merge branch 'stg-2.409' into stg-2.409-radius
---

22cb2560274e05e6490cf964cbbeb74a1991c642
diff --cc projects/stargazer/settings_impl.h
index 2bac34e4,9bcce5b0..1e6e2b0d
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@@ -24,17 -40,16 +24,17 @@@
  #include "stg/settings.h"
  #include "stg/common.h"
  #include "stg/module_settings.h"
 +#include "stg/ref.h"
  
+ #include <string>
+ #include <vector>
+ 
  //-----------------------------------------------------------------------------
  enum DETAIL_STAT_PERIOD {
 -dsPeriod_1,
 -dsPeriod_1_2,
 -dsPeriod_1_4,
 -dsPeriod_1_6
 +    dsPeriod_1,
 +    dsPeriod_1_2,
 +    dsPeriod_1_4,
 +    dsPeriod_1_6
  };
  //-----------------------------------------------------------------------------
  class STG_LOGGER;
@@@ -42,8 -57,8 +42,8 @@@ class DOTCONFDocumentNode
  //-----------------------------------------------------------------------------
  class SETTINGS_IMPL : public SETTINGS {
  public:
-     SETTINGS_IMPL(const std::string &);
+     explicit SETTINGS_IMPL(const std::string &);
 -    SETTINGS_IMPL(const SETTINGS_IMPL &);
 +    SETTINGS_IMPL(const SETTINGS_IMPL & rhs);
      virtual ~SETTINGS_IMPL() {}
      SETTINGS_IMPL & operator=(const SETTINGS_IMPL &);