X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=c7e1699bbac1193342e35e81df919be33b7fcfe6;hp=7229c7e337f3ec71efa1041d9799b3c3e4fe2c42;hb=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e;hpb=83b1c8d251386ac1980284c4668cbdd8e425550f diff --git a/pv/session.hpp b/pv/session.hpp index 7229c7e3..c7e1699b 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -29,12 +29,6 @@ #include #include -#ifdef _WIN32 -// Windows: Avoid boost/thread namespace pollution (which includes windows.h). -#define NOGDI -#define NORESOURCE -#endif - #include #include #include @@ -64,7 +58,7 @@ class Meta; class OutputFormat; class Packet; class Session; -} +} // namespace sigrok namespace pv { @@ -169,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);