Skip to content

Commit db0fae7

Browse files
committed
Remove iso646.h include from Config.h
1 parent 49aa595 commit db0fae7

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

include/SoapySDR/Config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
#define SOAPY_SDR_EXTERN
4949
#endif // SOAPY_SDR_DLL
5050

51-
#include <iso646.h>
5251

5352
#ifndef _MSC_VER
5453
#include <stdbool.h>

include/SoapySDR/Config.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,9 @@
1010

1111
#pragma once
1212
#include <SoapySDR/Config.h>
13-
#include <ciso646>
13+
14+
#if (defined(_MSVC_LANG) || __cplusplus < 201703L)
15+
// For old or nonconforming compilers,
16+
// using the alternative operator representations may require including this header.
17+
#include <ciso646>
18+
#endif

lib/LoggerC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ extern "C" {
7575

7676
void SoapySDR_log(const SoapySDRLogLevel logLevel, const char *message)
7777
{
78-
if (logLevel > registeredLogLevel and logLevel != SOAPY_SDR_SSI) return;
78+
if (logLevel > registeredLogLevel && logLevel != SOAPY_SDR_SSI) return;
7979
return registeredLogHandler(logLevel, message);
8080
}
8181

0 commit comments

Comments
 (0)