Inherit FILESETRES class from BRSRES class.

bareos · Feb 17, 2015 · 439d459 · 439d459
1 parent 79be85d
commit 439d459
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/dird/dird_conf.h b/src/dird/dird_conf.h
@@ -527,10 +527,8 @@ struct INCEXE {
 /*
  * FileSet Resource
  */
-class FILESETRES {
+class FILESETRES : public BRSRES {
 public:
-   RES hdr;
-
    bool new_include;                  /* Set if new include used */
    INCEXE **include_items;            /* Array of incexe structures */
    int32_t num_includes;              /* Number in array */
@@ -543,12 +541,9 @@ class FILESETRES {
    bool enable_vss;                   /* Enable Volume Shadow Copy */
 
    /* Methods */
-   char *name() const;
    bool print_config(POOL_MEM& buff);
 };
 
-inline char *FILESETRES::name() const { return hdr.name; }
-
 /*
  * Schedule Resource
  */

diff --git a/src/lib/parse_conf.h b/src/lib/parse_conf.h
@@ -213,7 +213,6 @@ class MSGSRES : public BRSRES {
    /*
     * Methods
     */
-//   char *name() const;
    void clear_in_use() { lock(); m_in_use=false; unlock(); }
    void set_in_use() { wait_not_in_use(); m_in_use=true; unlock(); }
    void set_closing() { m_closing=true; }