Enums are nice

indra/llvfs/llvfile.cpp

@@ -37,11 +37,6 @@
 #include "llmemory.h"
 #include "llvfs.h"
 
-const S32 LLVFile::READ			= 0x00000001;
-const S32 LLVFile::WRITE		= 0x00000002;
-const S32 LLVFile::READ_WRITE	= 0x00000003;  // LLVFile::READ & LLVFile::WRITE
-const S32 LLVFile::APPEND		= 0x00000006;  // 0x00000004 & LLVFile::WRITE
-
 static LLTrace::BlockTimerStatHandle FTM_VFILE_WAIT("VFile Wait");
 
 //----------------------------------------------------------------------------

indra/llvfs/llvfile.h

@@ -35,6 +35,14 @@
 class LLVFile
 {
 public:
+	enum operation_t : S32
+	{
+		READ = 0x00000001,
+		WRITE = 0x00000002,
+		READ_WRITE = 0x00000003,   // LLVFile::READ & LLVFile::WRITE
+		APPEND = 0x00000006   // 0x00000004 & LLVFile::WRITE
+	};
+
 	LLVFile(LLVFS *vfs, const LLUUID &file_id, const LLAssetType::EType file_type, S32 mode = LLVFile::READ);
 	~LLVFile();
 
@@ -68,12 +76,6 @@ protected:
 	static BOOL sAllocdVFSThread;
 	U32 threadPri() { return LLVFSThread::PRIORITY_NORMAL + llmin((U32)mPriority,(U32)0xfff); }
 	
-public:
-	static const S32 READ;
-	static const S32 WRITE;
-	static const S32 READ_WRITE;
-	static const S32 APPEND;
-	
 protected:
 	LLVFS	*mVFS;
 	LLUUID	mFileID;