re-enable "safety hack"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21854 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/Path.cpp b/src/support/Path.cpp
index 890040580b8315e7ab577dcbc2e8659b81654baf..147efd07e512bafde1dd1d3ac69e95378d0eb6ed 100644 (file)
--- a/src/support/Path.cpp
+++ b/src/support/Path.cpp
@@ -10,10 +10,10 @@
 
 #include <config.h>
 
-// Needed to prevent the definition of the unnamed_Path macro
+// Needed to prevent the definition of the unnamed_PathChanger macro
 // in the header file.
 
-#define PATH_C
+#define PATHCHANGER_C
 
 #include "support/Path.h"
 #include "support/lyxlib.h"

diff --git a/src/support/Path.h b/src/support/Path.h
index 31c63f686b4057a8e981c6aeb169110f638f57a9..4c3d6ba1e8546ed92ca0d551703df3a46f246e21 100644 (file)
--- a/src/support/Path.h
+++ b/src/support/Path.h
@@ -53,14 +53,12 @@ private:
 };
 
 // To avoid the wrong usage:
-// Path("/tmp");   // wrong
-// Path p("/tmp");  // right
+// PathChanger("/tmp");   // wrong
+// PathChanger p("/tmp");  // right
 // we add this macro:
-///
-// With boost 1.34 this is not usable anymore
-//#ifndef PATH_C
-//#define Path(x) unnamed_Path;
-//#endif
+#ifndef PATHCHANGER_C
+#define PathChanger(x) unnamed_PathChanger;
+#endif
 // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal
 
 } // namespace support