]> git.stg.codes - stg.git/commitdiff
Merge branch 'stg-2.409' into stg-2.409-radius
authorMaxim Mamontov <faust.madf@gmail.com>
Sat, 21 Jan 2017 19:02:07 +0000 (21:02 +0200)
committerMaxim Mamontov <faust.madf@gmail.com>
Sat, 21 Jan 2017 19:02:07 +0000 (21:02 +0200)
1  2 
projects/stargazer/settings_impl.h

index 2bac34e4359a2973059226c7928c36020cae2ef0,9bcce5b0f30bed2dbb9a259d6fa061202c06b40e..1e6e2b0df6e0cf04b237e35986fdecef16484799
  #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 &);