Преглед изворни кода

standard_delimiters caused static init problems

David Rose пре 24 година
родитељ
комит
b9498d9d50
2 измењених фајлова са 3 додато и 7 уклоњено
  1. 0 2
      dtool/src/dtoolutil/dSearchPath.cxx
  2. 3 5
      dtool/src/dtoolutil/dSearchPath.h

+ 0 - 2
dtool/src/dtoolutil/dSearchPath.cxx

@@ -21,8 +21,6 @@
 
 #include <algorithm>
 
-const string standard_delimiters = ": \n\t";
-
 ////////////////////////////////////////////////////////////////////
 //     Function: DSearchPath::Results::Constructor
 //       Access: Public

+ 3 - 5
dtool/src/dtoolutil/dSearchPath.h

@@ -25,8 +25,6 @@
 
 #include <vector>
 
-extern EXPCL_DTOOL const string standard_delimiters;
-
 ///////////////////////////////////////////////////////////////////
 //       Class : DSearchPath
 // Description : This class stores a list of directories that can be
@@ -57,7 +55,7 @@ public:
 
 PUBLISHED:
   DSearchPath();
-  DSearchPath(const string &path, const string &delimiters = standard_delimiters);
+  DSearchPath(const string &path, const string &delimiters = ": \n\t");
   DSearchPath(const DSearchPath &copy);
   void operator = (const DSearchPath &copy);
   ~DSearchPath();
@@ -66,7 +64,7 @@ PUBLISHED:
   void append_directory(const Filename &directory);
   void prepend_directory(const Filename &directory);
   void append_path(const string &path,
-                   const string &delimiters = standard_delimiters);
+                   const string &delimiters = ": \n\t");
   void append_path(const DSearchPath &path);
   void prepend_path(const DSearchPath &path);
 
@@ -79,7 +77,7 @@ PUBLISHED:
 
   INLINE static Filename
   search_path(const Filename &filename, const string &path,
-              const string &delimiters = standard_delimiters);
+              const string &delimiters = ": \n\t");
 
   void output(ostream &out, const string &separator = ":") const;
   void write(ostream &out, int indent_level = 0) const;