Changeset 588 for CMT/HEAD/source/cmt_deps_builder.h

Timestamp:

Nov 27, 2011, 4:36:15 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 465

File:

• CMT/HEAD/source/cmt_deps_builder.h (modified) (4 diffs)

CMT/HEAD/source/cmt_deps_builder.h

@@ -23 +23 @@
       : m_use (0), m_filter (0) { }
 
-    HeaderFilter (const Use* use, const cmt_regexp* filter, const cmt_string& stamp)
+    HeaderFilter (const Use* use, cmt_regexp* filter, const cmt_string& stamp)
       : m_use (use), m_filter (filter), m_stamp (stamp) { }
 
@@ -38 +38 @@
       {
         m_use = 0;
-        if (m_filter) delete m_filter;
+        if (m_filter) 
+          {
+            m_filter->clear ();
+            delete m_filter;
+          }
         m_filter = 0;
         m_stamp = cmt_string (); 
@@ -46 +50 @@
 
     const Use* m_use;
-    const cmt_regexp* m_filter;
+    cmt_regexp* m_filter;
     cmt_string m_stamp;
   };
@@ -55 +59 @@
   void add (const cmt_string& path, const cmt_string& substitution);
   void add_includes (const Use& use);
-  void add_header_filter (const Use* use, const cmt_regexp* filter, const cmt_string& stamp);
+  void add_header_filter (const Use* use, cmt_regexp* filter, const cmt_string& stamp);
   void add_header_filter (const HeaderFilter& hf);
-  CmtSystem::cmt_string_vector& run (const cmt_string& file_name);
+  CmtSystem::cmt_string_vector& run (const cmt_string& file_name,
+                                     const cmt_string& constituent_name);
 
-  DepsBuilder ()
-    { }
+  DepsBuilder ();
+  ~DepsBuilder ();
 
 private:
 
-  DepsBuilder (const DepsBuilder&)
-    { }
+  DepsBuilder (const DepsBuilder&);
+  DepsBuilder& operator = (const DepsBuilder&);
 
   CmtSystem::cmt_string_vector m_include_paths;
   CmtSystem::cmt_string_vector m_substitutions;
   HeaderFilters m_header_filters;
-
   CmtSystem::cmt_string_vector m_deps;
   CmtSystem::cmt_string_vector m_all_deps;