|
10 | 10 |
|
11 | 11 | #include "OSMPDummySensorConfig.h"
|
12 | 12 |
|
13 |
| -using namespace std; |
14 |
| - |
15 | 13 | #ifndef FMU_SHARED_OBJECT
|
16 | 14 | #define FMI2_FUNCTION_PREFIX OSMPDummySensor_
|
17 | 15 | #endif
|
@@ -122,7 +120,7 @@ class COSMPDummySensor {
|
122 | 120 | protected:
|
123 | 121 | /* Private File-based Logging just for Debugging */
|
124 | 122 | #ifdef PRIVATE_LOG_PATH
|
125 |
| - static ofstream private_log_file; |
| 123 | + static std::ofstream private_log_file; |
126 | 124 | #endif
|
127 | 125 |
|
128 | 126 | static void fmi_verbose_log_global(const char* format, ...) {
|
@@ -157,9 +155,9 @@ class COSMPDummySensor {
|
157 | 155 | #endif
|
158 | 156 | #ifdef PRIVATE_LOG_PATH
|
159 | 157 | if (!private_log_file.is_open())
|
160 |
| - private_log_file.open(PRIVATE_LOG_PATH, ios::out | ios::app); |
| 158 | + private_log_file.open(PRIVATE_LOG_PATH, std::ios::out | std::ios::app); |
161 | 159 | if (private_log_file.is_open()) {
|
162 |
| - private_log_file << "OSMPDummySensor" << "::" << instanceName << "<" << ((void*)this) << ">:" << category << ": " << buffer << endl; |
| 160 | + private_log_file << "OSMPDummySensor" << "::" << instanceName << "<" << ((void*)this) << ">:" << category << ": " << buffer << std::endl; |
163 | 161 | private_log_file.flush();
|
164 | 162 | }
|
165 | 163 | #endif
|
@@ -191,23 +189,23 @@ class COSMPDummySensor {
|
191 | 189 |
|
192 | 190 | protected:
|
193 | 191 | /* Members */
|
194 |
| - string instanceName; |
| 192 | + std::string instanceName; |
195 | 193 | fmi2Type fmuType;
|
196 |
| - string fmuGUID; |
197 |
| - string fmuResourceLocation; |
| 194 | + std::string fmuGUID; |
| 195 | + std::string fmuResourceLocation; |
198 | 196 | bool visible;
|
199 | 197 | bool loggingOn;
|
200 |
| - set<string> loggingCategories; |
| 198 | + std::set<std::string> loggingCategories; |
201 | 199 | fmi2CallbackFunctions functions;
|
202 | 200 | fmi2Boolean boolean_vars[FMI_BOOLEAN_VARS];
|
203 | 201 | fmi2Integer integer_vars[FMI_INTEGER_VARS];
|
204 | 202 | fmi2Real real_vars[FMI_REAL_VARS];
|
205 |
| - string string_vars[FMI_STRING_VARS]; |
| 203 | + std::string string_vars[FMI_STRING_VARS]; |
206 | 204 | bool simulation_started;
|
207 |
| - string* currentOutputBuffer; |
208 |
| - string* lastOutputBuffer; |
209 |
| - string* currentConfigRequestBuffer; |
210 |
| - string* lastConfigRequestBuffer; |
| 205 | + std::string* currentOutputBuffer; |
| 206 | + std::string* lastOutputBuffer; |
| 207 | + std::string* currentConfigRequestBuffer; |
| 208 | + std::string* lastConfigRequestBuffer; |
211 | 209 |
|
212 | 210 | /* Simple Accessors */
|
213 | 211 | fmi2Boolean fmi_valid() { return boolean_vars[FMI_BOOLEAN_VALID_IDX]; }
|
|
0 commit comments