fix conflect defer macro vs rxcpp
Some checks failed
linux-x64-gcc / linux-gcc (Debug) (push) Successful in 54s
linux-x64-gcc / linux-gcc (Release) (push) Failing after 9m11s

This commit is contained in:
tqcq 2024-03-14 22:09:48 +08:00
parent 9383d327e7
commit f794cb500a

View File

@ -1,6 +1,11 @@
#pragma once #pragma once
#ifndef SLED_SLED_H #ifndef SLED_SLED_H
#define SLED_SLED_H #define SLED_SLED_H
// thrid_party
#include "inja.hpp"
#include "rx.h"
// filesystem // filesystem
#include "sled/filesystem/path.h" #include "sled/filesystem/path.h"
#include "sled/filesystem/temporary_file.h" #include "sled/filesystem/temporary_file.h"
@ -65,7 +70,4 @@
#include "sled/system_time.h" #include "sled/system_time.h"
#include "sled/time_utils.h" #include "sled/time_utils.h"
#include "sled/variant.h" #include "sled/variant.h"
#include "inja.hpp"
#include "rx.h"
#endif// SLED_SLED_H #endif// SLED_SLED_H