[Box Backup-commit] COMMIT r3109 - box/trunk/lib/backupstore

subversion at boxbackup.org subversion at boxbackup.org
Fri May 4 10:38:05 BST 2012


Author: chris
Date: 2012-05-04 10:38:04 +0100 (Fri, 04 May 2012)
New Revision: 3109

Modified:
   box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp
   box/trunk/lib/backupstore/BackupStoreFilenameClear.h
Log:
Revert r3106 as it causes compile failures not seen locally.


Modified: box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp	2012-05-03 13:41:28 UTC (rev 3108)
+++ box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp	2012-05-04 09:38:04 UTC (rev 3109)
@@ -17,9 +17,13 @@
 
 #include "MemLeakFindOn.h"
 
-int BackupStoreFilenameClear::sEncodeMethod = BackupStoreFilename::Encoding_Clear;
-CipherContext BackupStoreFilenameClear::sBlowfishEncrypt;
-CipherContext BackupStoreFilenameClear::sBlowfishDecrypt;
+// Hide private variables from the rest of the world
+namespace
+{
+	int sEncodeMethod = BackupStoreFilename::Encoding_Clear;
+	CipherContext sBlowfishEncrypt;
+	CipherContext sBlowfishDecrypt;
+}
 
 // --------------------------------------------------------------------------
 //

Modified: box/trunk/lib/backupstore/BackupStoreFilenameClear.h
===================================================================
--- box/trunk/lib/backupstore/BackupStoreFilenameClear.h	2012-05-03 13:41:28 UTC (rev 3108)
+++ box/trunk/lib/backupstore/BackupStoreFilenameClear.h	2012-05-04 09:38:04 UTC (rev 3109)
@@ -11,8 +11,9 @@
 #define BACKUPSTOREFILENAMECLEAR__H
 
 #include "BackupStoreFilename.h"
-#include "CipherContext.h"
 
+class CipherContext;
+
 // --------------------------------------------------------------------------
 //
 // Class
@@ -53,9 +54,6 @@
 
 private:
 	mutable BackupStoreFilename_base mClearFilename;
-	static CipherContext sBlowfishEncrypt;
-	static CipherContext sBlowfishDecrypt;
-	static int sEncodeMethod;
 };
 
 #endif // BACKUPSTOREFILENAMECLEAR__H




More information about the Boxbackup-commit mailing list