Changeset 652 for CMT/HEAD/source/cmt_use.h

Timestamp:

Nov 5, 2013, 3:40:52 PM (11 years ago)

Author:

rybkin

Message:

See C.L. 511

File:

• CMT/HEAD/source/cmt_use.h (modified) (5 diffs)

CMT/HEAD/source/cmt_use.h

@@ -128 +128 @@
   bool get_paths (Use* to, UsePtrVector& list);
 
-  bool located () const;
-
-  void change_path (const cmt_string& path);
+  inline bool located () const { return m_located; }
+
+  void change_path (const cmt_string& path, const Project* project = 0);
   void set_auto_imports (State context_state, State specified_state,
                          cmt_map <Use*, bool>& visited);
@@ -153 +153 @@
   ScopeType get_current_scope () const;
 
-  Project* get_project ();
+  const Project* get_project () const;
+  inline void set_project (const Project* project) { m_project = project; }
   cmt_string get_info () const;
   bool is_head_version (const cmt_string& version);
@@ -182 +183 @@
   bool discarded;                /* discarded by version strategy   */
   bool selected;                 /* used for recursive access       */
-  bool m_located;
+  //  bool m_located;
   bool m_hidden;
   ScopeType initial_scope;
@@ -213 +214 @@
                       bool skip_discarded = false, ostream& out = cout);
   //  void show_sub_uses (const cmt_string& request, bool skip_discarded = false);
-  bool select_alternate ();
+  bool select_alternate (const Project* project = 0);
   Use* get_selected_version ();
   Use* set_selected_version (Use* selected_use);
@@ -235 +236 @@
   //cmt_string m_package_name; /* directly read from requirements */
 
+  //  Project* m_project;  /* the project the use is found in */
+  const Project* m_project;  /* the project the use is found in */
+
+  bool m_located;
+
   bool m_has_native_version;