amplcsv: add AMPLs fopen and fclose to FileHandler in order to fix issue with Visual Studio

Author: nfbvs

src/ampltableconnector/examples/amplcsv/src/handler.hpp

@@ -7,7 +7,7 @@
 using namespace amplt;
 
 static std::string name = "amplcsv";
-static std::string version = "beta 0.0.4";
+static std::string version = "beta 0.0.5";
 
 class Handler:
 public Connector{

src/ampltableconnector/include/ampltableconnector.hpp

@@ -507,8 +507,7 @@ class FileHandler {
 	){
 		this->ae = ae;
 		this->logger = logger;
-		f = fopen(filename.c_str(), mode.c_str());
-		closed = false;
+		f = ampl_fopen(filename.c_str(), mode.c_str());
 
 		if (f == NULL){
 			std::string log_msg = "FileHandler: could not open " + filename;
@@ -517,9 +516,7 @@ class FileHandler {
 		}
 	};
 	~FileHandler(){
-		if (!closed){
-			fclose(f);
-		}
+		close();
 	};
 	void ampl_fprintf(const char *format, ...){
 
@@ -534,9 +531,20 @@ class FileHandler {
 		};
 	};
 
+	FILE* ampl_fopen(const char * filename, const char * mode){
+		return ae->Fopen(filename, mode);
+	};
+
+	int ampl_fclose(FILE * stream){
+		int res = ae->Fclose(stream);
+		return res;
+	};
+
 	void close(){
-		fclose(f);
-		closed = true;
+		if (f){
+			ampl_fclose(f);
+			f = NULL;
+		}
 	};
 };
 
@@ -1044,6 +1052,15 @@ class Connector {
 	// These functions should be used instead of of standart library ones to prevent errors derived
 	// from diferent compiler implementations.
 
+	FILE* ampl_fopen(const char * filename, const char * mode){
+		return ae->Fopen(filename, mode);
+	};
+
+	int ampl_fclose(FILE * stream){
+		int res = ae->Fclose(stream);
+		return res;
+	};
+
 	int ampl_fprintf(FILE *stream, const char *format, ...){
 
 		va_list va;