Move private variables out of hidden namespace to help debugging.

2 files changed, 7 insertions, 9 deletions

diff --git a/lib/backupstore/BackupStoreFilenameClear.cpp b/lib/backupstore/BackupStoreFilenameClear.cpp
index ad5666cf..bf23fea8 100644
--- a/lib/backupstore/BackupStoreFilenameClear.cpp
+++ b/lib/backupstore/BackupStoreFilenameClear.cpp
@@ -17,13 +17,9 @@
 
 #include "MemLeakFindOn.h"
 
-// Hide private variables from the rest of the world
-namespace
-{
-	int sEncodeMethod = BackupStoreFilename::Encoding_Clear;
-	CipherContext sBlowfishEncrypt;
-	CipherContext sBlowfishDecrypt;
-}
+int BackupStoreFilenameClear::sEncodeMethod = BackupStoreFilename::Encoding_Clear;
+CipherContext BackupStoreFilenameClear::sBlowfishEncrypt;
+CipherContext BackupStoreFilenameClear::sBlowfishDecrypt;
 
 // --------------------------------------------------------------------------
 //
diff --git a/lib/backupstore/BackupStoreFilenameClear.h b/lib/backupstore/BackupStoreFilenameClear.h
index 595d1158..93217177 100644
--- a/lib/backupstore/BackupStoreFilenameClear.h
+++ b/lib/backupstore/BackupStoreFilenameClear.h
@@ -11,8 +11,7 @@
 #define BACKUPSTOREFILENAMECLEAR__H
 
 #include "BackupStoreFilename.h"
-
-class CipherContext;
+#include "CipherContext.h"
 
 // --------------------------------------------------------------------------
 //
@@ -54,6 +53,9 @@ protected:
 
 private:
 	mutable BackupStoreFilename_base mClearFilename;
+	static CipherContext sBlowfishEncrypt;
+	static CipherContext sBlowfishDecrypt;
+	static int sEncodeMethod;
 };
 
 #endif // BACKUPSTOREFILENAMECLEAR__H