diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-10-25 16:04:37 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-10-25 16:04:37 -0300 |
| commit | 38722eb732fb0e9f1dbe4a518df43fc5c6cc913c (patch) | |
| tree | 819d12296daf9384cee0befe9e456c25f1d83cb8 | |
| parent | 06e4e46e39946577094d5e4fdba7f5ed7662eaa3 (diff) | |
| download | PSP.git-38722eb732fb0e9f1dbe4a518df43fc5c6cc913c.tar.gz PSP.git-38722eb732fb0e9f1dbe4a518df43fc5c6cc913c.tar.xz PSP.git-38722eb732fb0e9f1dbe4a518df43fc5c6cc913c.zip | |
Codefix for 32 bits compilance
| -rw-r--r-- | Project/Electromechanical.cpp | 6 | ||||
| -rw-r--r-- | Project/compile_flags.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Project/Electromechanical.cpp b/Project/Electromechanical.cpp index fd74414..8d97d5b 100644 --- a/Project/Electromechanical.cpp +++ b/Project/Electromechanical.cpp @@ -142,9 +142,9 @@ void Electromechanical::SetEventTimeList() auto data = bus->GetElectricalData(); if(data.stabHasFault) { m_eventTimeList.emplace_back(data.stabFaultTime); - m_eventOccurrenceList.emplace_back(false); + m_eventOccurrenceList.push_back(false); m_eventTimeList.emplace_back(data.stabFaultTime + data.stabFaultLength); - m_eventOccurrenceList.emplace_back(false); + m_eventOccurrenceList.push_back(false); } } // Switching @@ -153,7 +153,7 @@ void Electromechanical::SetEventTimeList() SwitchingData swData = element->GetSwitchingData(); for(unsigned int i = 0; i < swData.swTime.size(); ++i) { m_eventTimeList.emplace_back(swData.swTime[i]); - m_eventOccurrenceList.emplace_back(false); + m_eventOccurrenceList.push_back(false); } } } diff --git a/Project/compile_flags.txt b/Project/compile_flags.txt index 522bc06..79426de 100644 --- a/Project/compile_flags.txt +++ b/Project/compile_flags.txt @@ -5,7 +5,7 @@ -IC:\TDM-GCC-64\include -IC:\TDM-GCC-64\lib\gcc\x86_64-w64-mingw32\5.1.0\include-fixed -IC:\TDM-GCC-64\x86_64-w64-mingw32\include --IC:\Users\thale\Documents\GitHub\PSP\Project +-IC:\Users\NDSE-69\Documents\GitHub\PSP\Project -IC:\wxWidgets-3.1.2\lib\gcc_dll\mswu -IC:\wxWidgets-3.1.2\include -D_UNICODE |