Merge remote-tracking branch 'github/master'

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

diff --git a/projects/sgconf/action.h b/projects/sgconf/action.h
index 940ea7f6272673bad87ab08aa12819e8e86a602f..bd3555ed6125b3466be44943cd4375386d7bd813 100644 (file)
--- a/projects/sgconf/action.h
+++ b/projects/sgconf/action.h
@@ -18,8 +18,7 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#ifndef __STG_SGCONF_ACTION_H__
-#define __STG_SGCONF_ACTION_H__
+#pragma once

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


@@ -37,21 +36,17 @@ class ACTION
     public:
         virtual ~ACTION() {}
 
     public:
         virtual ~ACTION() {}
 

-        virtual ACTION * Clone() const = 0;

         virtual std::string ParamDescription() const = 0;
         virtual std::string DefaultDescription() const = 0;
         virtual OPTION_BLOCK & Suboptions() = 0;
         virtual PARSER_STATE Parse(int argc, char ** argv, void * data = NULL) = 0;
         virtual void ParseValue(const std::string &) {}
 
         virtual std::string ParamDescription() const = 0;
         virtual std::string DefaultDescription() const = 0;
         virtual OPTION_BLOCK & Suboptions() = 0;
         virtual PARSER_STATE Parse(int argc, char ** argv, void * data = NULL) = 0;
         virtual void ParseValue(const std::string &) {}
 

-        class ERROR : public std::runtime_error
+        struct ERROR : std::runtime_error

         {
         {

-            public:
-                ERROR(const std::string & message)
-                    : std::runtime_error(message.c_str()) {}
+            explicit ERROR(const std::string & message)
+                : std::runtime_error(message.c_str()) {}

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

-
-#endif