mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-17 02:45:33 +08:00
Remove push_macro, seems no longer to be needed
This commit is contained in:
@@ -11,9 +11,10 @@
|
|||||||
#ifndef STDGUI_SWIFTGUISTD_H
|
#ifndef STDGUI_SWIFTGUISTD_H
|
||||||
#define STDGUI_SWIFTGUISTD_H
|
#define STDGUI_SWIFTGUISTD_H
|
||||||
|
|
||||||
|
//! \fixme KB 2019-06 Seems to be no longer needed, can be removed after 2019-10
|
||||||
// clash with struct interface in objbase.h used to happen
|
// clash with struct interface in objbase.h used to happen
|
||||||
#pragma push_macro("interface")
|
// #pragma push_macro("interface")
|
||||||
#undef interface
|
// #undef interface
|
||||||
|
|
||||||
#include "blackgui/components/maininfoareacomponent.h"
|
#include "blackgui/components/maininfoareacomponent.h"
|
||||||
#include "blackgui/components/navigatordialog.h"
|
#include "blackgui/components/navigatordialog.h"
|
||||||
@@ -307,6 +308,6 @@ private:
|
|||||||
//! @}
|
//! @}
|
||||||
};
|
};
|
||||||
|
|
||||||
#pragma pop_macro("interface")
|
// #pragma pop_macro("interface")
|
||||||
|
|
||||||
#endif // guard
|
#endif // guard
|
||||||
|
|||||||
Reference in New Issue
Block a user