Changeset 662 for CMT/HEAD/source/cmt_symbol.cxx

Timestamp:

Jan 6, 2014, 3:40:25 PM (10 years ago)

Author:

rybkin

Message:

See C.L. 521

File:

• CMT/HEAD/source/cmt_symbol.cxx (modified) (6 diffs)

CMT/HEAD/source/cmt_symbol.cxx

@@ -53 +53 @@
   inline void set_strip_path (const bool& strip_path);
 
+  static PathBuilder* get_path_builder ();
+
+private:
   PathBuilder ();
   PathBuilder (bool strip_path);
-
-private:
+  PathBuilder (const PathBuilder& other);
+  PathBuilder& operator = (const PathBuilder& other);
+
   bool m_strip_path;
 };
@@ -754 +758 @@
 {
   static SetBuilder Set;
-  static PathBuilder Path (Cmt::get_strip_path ());
+  static PathBuilder* PathPtr (PathBuilder::get_path_builder ());
+  //static PathBuilder Path (Cmt::get_strip_path ());
   //static PathBuilder Path;
   static MacroBuilder Macro;
@@ -915 +920 @@
       break;
     case SymbolPath:
-      symbol.builder = &Path;
+      symbol.builder = PathPtr;
+      //symbol.builder = &Path;
       break;
     case SymbolAlias:
@@ -1261 +1267 @@
 bool Symbol::set_strip_path (const bool& strip_path)
 {
+  PathBuilder::get_path_builder ()->set_strip_path (strip_path);
+  return true;
+  /*
   // searching for a path symbol
   for (int number = 0; number < Symbol::symbol_number (); number++)
@@ -1274 +1283 @@
 
   return false;
+  */
 }
 
@@ -2595 +2605 @@
 }
 */
+//-------------------------------------------------------------
+PathBuilder* PathBuilder::get_path_builder ()
+{
+  static PathBuilder Path (Cmt::get_strip_path ());
+  return &Path;
+}
+
 //-------------------------------------------------------------
 PathBuilder::PathBuilder ()