Commit 20aca669 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Renamed tnlIOMode to TNL::IOMode

parent 4f276acd

examples/quad-test/main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int main(int argc, char* argv[]) { 


	String inputFile = parameters.getParameter <String> ("input-file");

	File binaryFile;

	if(! binaryFile.open(inputFile, tnlReadMode)) {

	if(! binaryFile.open(inputFile, IOMode::read)) {

		cerr << "I am not able to open the file " << inputFile << "." << std::endl;

		return 1;

	}

src/TNL/Containers/Array_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ Array< Element, Device, Index >:: 
boundLoad( const String& fileName )

{

   File file;

   if( ! file. open( fileName, tnlReadMode ) )

   if( ! file. open( fileName, IOMode::read ) )

   {

      cerr << "I am not bale to open the file " << fileName << " for reading." << endl;

      return false;

src/TNL/Curve.h

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ template< class T > bool Write( const Curve< T >& curve, 
   if( strncmp( format, "tnl",3 ) == 0 )

   {

      File file;

      if( ! file. open( String( file_name ) + String( ".tnl" ), tnlWriteMode ) )

      if( ! file. open( String( file_name ) + String( ".tnl" ), IOMode::write ) )

      {

         std::cerr << "I am not able to open the file " << file_name << " for drawing curve." << std::endl;

         return false;
@@ -202,7 +202,7 @@ template< class T > bool Read( Curve< T >& crv, 
                               const char* input_file )

{

   File file;

   if( ! file. open( String( input_file ), tnlReadMode  ) )

   if( ! file. open( String( input_file ), IOMode::read  ) )

   {

     std::cout << " unable to open file " << input_file << std::endl;

      return false;

src/TNL/File.cpp

+6 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ namespace TNL { 
int File :: verbose = 0;



File :: File()

: mode( tnlUndefinedMode ),

: mode( IOMode::undefined ),

  file( NULL ),

  fileOK( false ),

  writtenElements( 0 ),
@@ -32,20 +32,20 @@ File :: ~File() 
}



bool File :: open( const String& fileName,

                      const tnlIOMode mode )

                   const IOMode mode )

{

   this->fileName = fileName;

   if( verbose )

   {

      std::cout << "Opening file " << fileName;

      if( mode == tnlReadMode )

      if( mode == IOMode::read )

         std::cout << " for reading... " << std::endl;

      else

         std::cout << " for writing ... " << std::endl;

   }

   if( mode == tnlReadMode )

   if( mode == IOMode::read )

      file = fopen( fileName. getString(), "r" );

   if( mode == tnlWriteMode )

   if( mode == IOMode::write )

      file = fopen( fileName. getString(), "w" );

   if( file ==  NULL )

   {
@@ -69,7 +69,7 @@ bool File :: close() 
      return false;

   }

   // reset all attributes

   mode = tnlUndefinedMode;

   mode = IOMode::undefined;

   file = NULL;

   fileOK = false;

   fileName = "";

src/TNL/File.h

+8 −5
Original line number Diff line number Diff line
@@ -25,9 +25,12 @@ 


namespace TNL {



enum tnlIOMode { tnlUndefinedMode = 0,

                 tnlReadMode = 1,

                 tnlWriteMode = 2 };

enum class IOMode

{

   undefined = 0,

   read = 1,

   write = 2

};



/* When we need to transfer data between the GPU and the CPU we use

 * 5 MB buffer. This size should ensure good performance -- see.
@@ -41,7 +44,7 @@ const size_t tnlFileGPUvsCPUTransferBufferSize = 5 * 2<<20; 
 */

class File

{

   tnlIOMode mode;

   IOMode mode;



   FILE* file;
@@ -60,7 +63,7 @@ class File 
   ~File();



   bool open( const String& fileName,

              const tnlIOMode mode );

              const IOMode mode );





	const String& getFileName() const