3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 02:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replaced all "long long" types with int64_t

Browse source 
Replaced all "unsigned long long" types with uint64_t.
These "new" types better communicate their meaning and they are
guaranteed to behave the same on all platforms & compilers.
This commit is contained in:
Vojtech Bubnik 2020-12-10 08:40:08 +01:00
parent fbf2978190
commit bd79036d13
9 changed files with 52 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/InstanceCheck.cpp
View file

@ -17,6 +17,7 @@
#include <fcntl.h>
#include <errno.h>
#include <optional>
#include <cstdint>
#ifdef _WIN32
#include <strsafe.h>
@ -82,10 +83,10 @@ namespace instance_check_internal
if (wndTextString.find(L"PrusaSlicer") != std::wstring::npos && classNameString == L"wxWindowNR") {
//check if other instances has same instance hash
//if not it is not same version(binary) as this version
HANDLE handle = GetProp(hwnd, L"Instance_Hash_Minor");
unsigned long long other_instance_hash = PtrToUint(handle);
unsigned long long other_instance_hash_major;
unsigned long long my_instance_hash = GUI::wxGetApp().get_instance_hash_int();
HANDLE handle = GetProp(hwnd, L"Instance_Hash_Minor");
uint64_t other_instance_hash = PtrToUint(handle);
uint64_t other_instance_hash_major;
uint64_t my_instance_hash = GUI::wxGetApp().get_instance_hash_int();
handle = GetProp(hwnd, L"Instance_Hash_Major");
other_instance_hash_major = PtrToUint(handle);
other_instance_hash_major = other_instance_hash_major << 32;