Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
Conflicts:
	src/main.cpp
  • Loading branch information
Sanil Rao committed Jun 17, 2016
2 parents ec7e4ca + 2280fcb commit b666dfe
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions src/main.cpp
@@ -1,6 +1,10 @@
<<<<<<< HEAD

//Dummy line for pull request test
//Hello at the top
=======
//
>>>>>>> upstream/master
#include "automata.h"
#include "pass.h"
#include "profiler.h"
Expand All @@ -11,7 +15,6 @@
#include <chrono>
#include <ctime>
#include <thread>
#include "errno.h"

#define FROM_INPUT_STRING false

Expand Down Expand Up @@ -63,25 +66,11 @@ uint32_t fileSize(string fn) {
return fileSize;
}

void checkError()
{
if(errno == ENOENT)
{
cout<< "VAsim Error: input file could not be found"<<endl;
exit(-1);
}
}

vector<unsigned char> file2CharVector(string fn) {

// open the file:
std::ifstream file(fn, ios::binary);

if(file.fail())
{
checkError();
}

// get its size:
std::streampos fileSize;

Expand Down

0 comments on commit b666dfe

Please sign in to comment.