mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-04 08:02:20 +01:00
fix the clang CI build
Every module unit now includes the standard headers it uses. Declarations reaching a unit only through an imported module's global module fragment are reachable but not visible, so ADL misses the free operators older libstdc++ declares beside a type - reproduced on ubuntu 24.04 (libstdc++ 13), where gl/vao.cpp could not compare vector iterators. Also drops a stale editor/editorSettings.hpp from the MSVC source list, which broke the Windows configure step, silences the deliberate include-in-purview warning in the glm wrapper, and removes GCC support: clang or MSVC only.
This commit is contained in:
@@ -1,4 +1,14 @@
|
||||
module;
|
||||
#include <array>
|
||||
#include <limits>
|
||||
#include <utility>
|
||||
#include <map>
|
||||
#include <optional>
|
||||
#include <ostream>
|
||||
#include <random>
|
||||
#include <sstream>
|
||||
#include <thread>
|
||||
#include <unordered_map>
|
||||
#include <cmath>
|
||||
#include "glad/glad.h"
|
||||
#include <chrono>
|
||||
|
||||
@@ -7,6 +7,13 @@ obtain one at
|
||||
http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
module;
|
||||
#include <array>
|
||||
#include <chrono>
|
||||
#include <limits>
|
||||
#include <ostream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include <optional>
|
||||
#include <unordered_map>
|
||||
#include "utilities/Globals_macros.h"
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
module;
|
||||
#include <chrono>
|
||||
#include <fstream>
|
||||
#include <ios>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <format>
|
||||
#include "utilities/Globals_macros.h"
|
||||
#include "winheaders.h"
|
||||
|
||||
@@ -7,6 +7,7 @@ obtain one at
|
||||
http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
module;
|
||||
#include <cstddef>
|
||||
#include <unordered_map>
|
||||
#include <string>
|
||||
#include <deque>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
module;
|
||||
#include <chrono>
|
||||
#include <ctime>
|
||||
#include "utilities/Globals_macros.h"
|
||||
#include "winheaders.h"
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
module;
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
#include <client/crash_report_database.h>
|
||||
#include <client/settings.h>
|
||||
#include <client/crashpad_client.h>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
module;
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include "vehicle/DynObj_macros.h"
|
||||
|
||||
@@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
// collection of keyword-value pairs
|
||||
// NOTE: since our python dictionary operates on a few types, most of the class was hardcoded for simplicity
|
||||
module;
|
||||
#include <utility>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
||||
@@ -40,6 +40,12 @@ export module eu07.glm;
|
||||
// merge when the same glm declarations arrive from several different modules
|
||||
// ("conflicting imported declaration" on glm::detail::storage), so glm has to be
|
||||
// compiled into exactly one module.
|
||||
// Clang warns that including inside the purview attaches the declarations to
|
||||
// this module. That is exactly the point here, so silence it for this block.
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
|
||||
#endif
|
||||
export {
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/fwd.hpp>
|
||||
@@ -62,6 +68,9 @@ export {
|
||||
// call sites of glm::to_string include it in their own module fragment.
|
||||
#include <glm/gtx/transform.hpp>
|
||||
}
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
export {
|
||||
// 12-byte vec3 that stays packed regardless of GLM_FORCE_DEFAULT_ALIGNED_GENTYPES.
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
module;
|
||||
#include <string>
|
||||
#include <chrono>
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
module;
|
||||
#include <istream>
|
||||
#include <deque>
|
||||
#include <fstream>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <memory>
|
||||
#include "utilities/Globals_macros.h"
|
||||
#include <cstring>
|
||||
|
||||
@@ -12,6 +12,8 @@ http://mozilla.org/MPL/2.0/.
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// cParser -- generic class for parsing text data, either from file or provided string
|
||||
module;
|
||||
#include <cstddef>
|
||||
#include <istream>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <fstream>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
module;
|
||||
#include <ios>
|
||||
#include <sstream>
|
||||
#include <unordered_map>
|
||||
#include <fstream>
|
||||
#include <istream>
|
||||
|
||||
@@ -7,6 +7,7 @@ obtain one at
|
||||
http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
module;
|
||||
#include <istream>
|
||||
#include "utilities/translation_macros.h"
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
module;
|
||||
#include <tuple>
|
||||
#include <vector>
|
||||
#include <libserialport.h>
|
||||
#include "winheaders.h"
|
||||
#include <filesystem>
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
module;
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
#include <tuple>
|
||||
#include <vector>
|
||||
#include <libserialport.h>
|
||||
#include <chrono>
|
||||
#include <cstdint>
|
||||
|
||||
@@ -1,4 +1,16 @@
|
||||
module;
|
||||
#include <limits>
|
||||
#include <type_traits>
|
||||
#include <array>
|
||||
#include <condition_variable>
|
||||
#include <cstddef>
|
||||
#include <iomanip>
|
||||
#include <iterator>
|
||||
#include <mutex>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -12,6 +12,13 @@ http://mozilla.org/MPL/2.0/.
|
||||
/*rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze*/
|
||||
/*konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc*/
|
||||
module;
|
||||
#include <cstddef>
|
||||
#include <limits>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include "utilities/utilities_macros.h"
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
|
||||
Reference in New Issue
Block a user