Skip to content

Commit

Permalink
AdsLib: drop #ifdef __cplusplus
Browse files Browse the repository at this point in the history
We always required c++11, however we add some ifdef __cplusplus guards,
which are pretty confusing in this context. Let's remove them.

Fixes: #127

Signed-off-by: Patrick Bruenn <[email protected]>
  • Loading branch information
pbruenn committed Mar 16, 2021
1 parent d4fb045 commit 2508531
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions AdsLib/standalone/AdsDef.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,8 @@

#pragma once

#ifdef __cplusplus
#include <cstdint>
#include <string>
#else
#include <stdint.h>
#endif

#define ADS_TCP_SERVER_PORT 0xBF02

Expand Down Expand Up @@ -244,12 +240,10 @@ struct AmsNetId {
/** NetId, consisting of 6 digits. */
uint8_t b[6];

#ifdef __cplusplus
AmsNetId(uint32_t ipv4Addr = 0);
AmsNetId(const std::string& addr);
AmsNetId(uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t);
operator bool() const;
#endif
};

/**
Expand Down

0 comments on commit 2508531

Please sign in to comment.