Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 8bb1ac747 -> 9bb72d2fa
MINIFICPP-628: Fix issues with Device Info This closes #409. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/9bb72d2f Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/9bb72d2f Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/9bb72d2f Branch: refs/heads/master Commit: 9bb72d2fa6028abfc4222510f43b53e9d1c659f3 Parents: 8bb1ac7 Author: Marc Parisi <[email protected]> Authored: Wed Oct 3 12:17:55 2018 -0400 Committer: Aldrin Piri <[email protected]> Committed: Thu Oct 4 12:45:20 2018 -0400 ---------------------------------------------------------------------- README.md | 2 +- libminifi/include/core/state/nodes/DeviceInformation.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/9bb72d2f/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 69faea8..a59589d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -# Apache NiFi - MiNiFi - C++ [](https://travis-ci.org/apache/nifi-minifi-cpp) +# Apache NiFi - MiNiFi - C++ [](https://travis-ci.org/apache/nifi-minifi-cpp) [](https://ci.appveyor.com/project/ApacheSoftwareFoundation/nifi-minifi-cpp) MiNiFi is a child project effort of Apache NiFi. This repository is for a native implementation in C++. http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/9bb72d2f/libminifi/include/core/state/nodes/DeviceInformation.h ---------------------------------------------------------------------- diff --git a/libminifi/include/core/state/nodes/DeviceInformation.h b/libminifi/include/core/state/nodes/DeviceInformation.h index c5229a7..f0e6ccd 100644 --- a/libminifi/include/core/state/nodes/DeviceInformation.h +++ b/libminifi/include/core/state/nodes/DeviceInformation.h @@ -417,16 +417,22 @@ class DeviceInfoNode : public DeviceInformation { switch (si.wProcessorArchitecture) { +#ifdef PROCESSOR_ARCHITECTURE_ARM case PROCESSOR_ARCHITECTURE_ARM: arch.value = "arm32"; break; +#endif +#ifdef PROCESSOR_ARCHITECTURE_ARM64 case PROCESSOR_ARCHITECTURE_ARM64: arch.value = "arm64"; break; +#endif case PROCESSOR_ARCHITECTURE_INTEL: +#ifdef PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 case PROCESSOR_ARCHITECTURE_IA32_ON_ARM64: arch.value = "x32"; break; +#endif case PROCESSOR_ARCHITECTURE_AMD64: case PROCESSOR_ARCHITECTURE_IA64: arch.value = "x64";
