Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/paradiseo/paradiseo

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Arnaud Liefooghe 2014-10-22 12:42:04 +02:00
commit b2b092bdd4
5 changed files with 151 additions and 78 deletions

View file

@ -45,12 +45,12 @@ public:
*
* @param _fileData the file name which contains the instance of QAP from QAPlib
*/
QAPeval(string & _fileData) {
fstream file(_fileData.c_str(), ios::in);
QAPeval(std::string _fileData) {
std::fstream file(_fileData.c_str(), std::ios::in);
if (!file) {
string str = "QAPeval: Could not open file [" + _fileData + "]." ;
throw runtime_error(str);
std::string str = "QAPeval: Could not open file [" + _fileData + "]." ;
throw std::runtime_error(str);
}
unsigned i, j;