in addition to the changes mentioned in ChangeLog, there is the usual batch of whites...

[lyx.git] / src / support / filetools.C

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 20d7823ea897f1d8a9e75a1875dbe66e9eb363b5..e29bbcdd02eba81e37ace3281cdf6753aa687057 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -17,7 +17,9 @@
 #include <config.h>
 
 #include <cctype>
-#include <pair.h>
+#include <utility>
+using std::make_pair;
+using std::pair;
 
 #ifdef __GNUG__
 #pragma implementation "filetools.h"
@@ -49,8 +51,6 @@
 # endif
 #endif
 
-using std::make_pair;
-
 extern string system_lyxdir;
 extern string build_lyxdir;
 extern string user_lyxdir;
@@ -616,7 +616,6 @@ bool AbsolutePath(string const & path)
 // Supports ./ and ~/. Later we can add support for ~logname/. (Asger)
 string ExpandPath(string const & path)
 {
-       Assert(!path.empty()); // We don't allow empty path. (Lgb)
        // checks for already absolute path
        string RTemp = ReplaceEnvironmentPath(path);
        if (AbsolutePath(RTemp))
@@ -700,7 +699,6 @@ string CleanupPath(string const & path)
 
 string ReplaceEnvironmentPath(string const & path)
 {
-       Assert(!path.empty()); // We don't allow empty path. (Lgb)
 // 
 // CompareChar: Environmentvariables starts with this character
 // PathChar:    Next path component start with this character