pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-06 22:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid C preprocessor macros (#3138)

Browse Source
This commit is contained in:
Eisuke Kawashima
2020-05-05 15:08:20 +09:00
committed by GitHub
parent a9d5170239
commit 535d8a2f35
11 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Code/DataStructs/BitOps.cpp
View File

@@ -871,14 +871,14 @@ template RDKIT_DATASTRUCTS_EXPORT void UpdateBitVectFromBinaryText(ExplicitBitVe
#include <intrin.h>
#ifdef _WIN64
#define BUILTIN_POPCOUNT_INSTR __popcnt64
#define BUILTIN_POPCOUNT_TYPE boost::uint64_t
using BUILTIN_POPCOUNT_TYPE = boost::uint64_t;
#else
#define BUILTIN_POPCOUNT_INSTR __popcnt
#define BUILTIN_POPCOUNT_TYPE std::uint32_t
using BUILTIN_POPCOUNT_TYPE = std::uint32_t;
#endif
#else
#define BUILTIN_POPCOUNT_INSTR __builtin_popcountll
#define BUILTIN_POPCOUNT_TYPE boost::uint64_t
using BUILTIN_POPCOUNT_TYPE = boost::uint64_t;
#endif
// the Bitmap Tanimoto and Dice similarity code is adapted