X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=c7e1699bbac1193342e35e81df919be33b7fcfe6;hb=37849039c0a75b20f198292979e843267d29ea7e;hp=4ac7f509b516dcf18b4738753b1dd5038041f6ec;hpb=6f925ba9d6faf1077b73c5a5808259576081716a;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index 4ac7f509..c7e1699b 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -29,13 +29,6 @@ #include #include -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif -#include - #include #include #include @@ -65,7 +58,7 @@ class Meta; class OutputFormat; class Packet; class Session; -} +} // namespace sigrok namespace pv { @@ -170,8 +163,7 @@ public: bool has_view(shared_ptr view); - const unordered_set< shared_ptr > - signalbases() const; + const unordered_set< shared_ptr > signalbases() const; #ifdef ENABLE_DECODE bool add_decoder(srd_decoder *const dec);