* src/text2.C: deleteEmptyParagraphMechanism(): fix a crash in

[lyx.git] / src / support / path.h

diff --git a/src/support/path.h b/src/support/path.h
index e043e11035356702dcd656d7ad506657557e2635..13296353aa6a87ce6b919773e6c2804915cb1663 100644 (file)
--- a/src/support/path.h
+++ b/src/support/path.h
@@ -12,9 +12,12 @@
 #ifndef PATH_H
 #define PATH_H
 
-#include "support/std_string.h"
+#include "support/filename.h"
+
 #include <boost/utility.hpp>
 
+#include <string>
+
 namespace lyx {
 namespace support {
 
@@ -34,7 +37,7 @@ namespace support {
 class Path : boost::noncopyable {
 public:
        /// change to the given directory
-       explicit Path(string const & path);
+       explicit Path(std::string const & path);
 
        /// set cwd to the previous value if needed
        ~Path();
@@ -45,7 +48,7 @@ private:
        /// whether we are in the new cwd or not
        bool popped_;
        /// the previous cwd
-       string pushedDir_;
+       FileName pushedDir_;
 };
 
 // To avoid the wrong usage:
@@ -53,9 +56,10 @@ private:
 // Path p("/tmp");  // right
 // we add this macro:
 ///
-#ifndef PATH_C
-#define Path(x) unnamed_Path;
-#endif
+// With boost 1.34 this is not usable anymore
+//#ifndef PATH_C
+//#define Path(x) unnamed_Path;
+//#endif
 // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal
 
 } // namespace support