Mercurial > hg > orthanc
changeset 6685:0e54f5c3f43b
replacing llu by ull to make msvc2008 happy
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 13 Apr 2026 08:46:24 +0200 |
| parents | 3289021b83db |
| children | b20a48627847 |
| files | OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp OrthancFramework/Sources/Images/PamReader.cpp OrthancFramework/UnitTestsSources/ToolboxTests.cpp OrthancServer/Sources/main.cpp |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp Sun Apr 12 13:33:53 2026 +0200 +++ b/OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp Mon Apr 13 08:46:24 2026 +0200 @@ -43,8 +43,8 @@ #include <memory> static const uint64_t MAX_FRAME_SIZE = (sizeof(void*) == 4 - ? 1llu * 1024llu * 1024llu * 1024llu // 1 GB on 32 bits system - : 4llu * 1024llu * 1024llu * 1024llu); // 4 GB on 64 bits system + ? 1ull * 1024ull * 1024ull * 1024ull // 1 GB on 32 bits system + : 4ull * 1024ull * 1024ull * 1024ull); // 4 GB on 64 bits system namespace Orthanc
--- a/OrthancFramework/Sources/Images/PamReader.cpp Sun Apr 12 13:33:53 2026 +0200 +++ b/OrthancFramework/Sources/Images/PamReader.cpp Mon Apr 13 08:46:24 2026 +0200 @@ -40,8 +40,8 @@ #include <limits> static const uint64_t MAX_PAM_IMAGE_BUFFER_SIZE = (sizeof(void*) == 4 - ? 1llu * 1024llu * 1024llu * 1024llu // 1 GB on 32 bits system - : 4llu * 1024llu * 1024llu * 1024llu); // 4 GB on 64 bits system + ? 1ull * 1024ull * 1024ull * 1024ull // 1 GB on 32 bits system + : 4ull * 1024ull * 1024ull * 1024ull); // 4 GB on 64 bits system namespace Orthanc
--- a/OrthancFramework/UnitTestsSources/ToolboxTests.cpp Sun Apr 12 13:33:53 2026 +0200 +++ b/OrthancFramework/UnitTestsSources/ToolboxTests.cpp Mon Apr 13 08:46:24 2026 +0200 @@ -464,13 +464,13 @@ { if (sizeof(void*) == 4) { - ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967295llu), 4294967295llu); - ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967296llu), 4294967295llu); + ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967295ull), 4294967295ull); + ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967296ull), 4294967295ull); } else if (sizeof(void*) == 8) { - ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967295llu), 4294967295llu); - ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967296llu), 4294967296llu); + ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967295ull), 4294967295ull); + ASSERT_EQ(Toolbox::BoundMemorySizeToCurrentArchitecture(4294967296ull), 4294967296ull); } else {
--- a/OrthancServer/Sources/main.cpp Sun Apr 12 13:33:53 2026 +0200 +++ b/OrthancServer/Sources/main.cpp Mon Apr 13 08:46:24 2026 +0200 @@ -1129,7 +1129,7 @@ httpServer.SetRequestTimeout(lock.GetConfiguration().GetUnsignedIntegerParameter("HttpRequestTimeout", 30)); // New in Orthanc 1.12.11 - static const uint64_t MEGABYTE = 1024llu * 1024llu; + static const uint64_t MEGABYTE = 1024ull * 1024ull; const unsigned int maxBodySize = lock.GetConfiguration().GetUnsignedIntegerParameter("MaximumRequestBodySizeMB", 8192); if (maxBodySize != 0) {
