Remove remaining fixed-size ints from Yuni (#1629)

AntaresSimulatorTeam · Sep 19, 2023 · 948c9c9 · 948c9c9
1 parent ebc2f13
commit 948c9c9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 55 deletions.
diff --git a/src/ext/yuni/src/yuni/core/color/rgb.h b/src/ext/yuni/src/yuni/core/color/rgb.h
@@ -28,7 +28,7 @@ namespace Color
 ** \brief 32Bits RGB Color Model (additive color model + transparency)
 ** \ingroup Color
 */
-template<class T = uint8>
+template<class T = uint8_t>
 class YUNI_DECL RGB final
 {
 public:

diff --git a/src/ext/yuni/src/yuni/core/getopt/option.h b/src/ext/yuni/src/yuni/core/getopt/option.h
@@ -152,10 +152,10 @@ class Flag<int64_t>
 };
 
 template<>
-class Flag<uint16>
+class Flag<uint16_t>
 {
 public:
-    static void Enable(uint16& out)
+    static void Enable(uint16_t& out)
     {
         out = 1u;
     }

diff --git a/src/ext/yuni/src/yuni/core/static/types.h b/src/ext/yuni/src/yuni/core/static/types.h
@@ -181,15 +181,6 @@ struct IsFundamental<bool>
     };
 };
 template<>
-struct IsFundamental<signed char>
-{
-    enum
-    {
-        Yes = 1,
-        No = 0
-    };
-};
-template<>
 struct IsFundamental<wchar_t>
 {
     enum
@@ -228,7 +219,7 @@ struct IsFundamental<long double>
 // Signed int
 #ifndef YUNI_TYPES_INT8_CHAR_ARE_IDENTICAL
 template<>
-struct IsFundamental<sint8>
+struct IsFundamental<int8_t>
 {
     enum
     {
@@ -267,7 +258,7 @@ struct IsFundamental<int64_t>
 // Unsigned int
 #ifndef YUNI_TYPES_INT8_CHAR_ARE_IDENTICAL
 template<>
-struct IsFundamental<uint8>
+struct IsFundamental<uint8_t>
 {
     enum
     {
@@ -276,7 +267,7 @@ struct IsFundamental<uint8>
     };
 };
 template<>
-struct IsFundamental<uint16>
+struct IsFundamental<uint16_t>
 {
     enum
     {

diff --git a/src/ext/yuni/src/yuni/core/system/stdint.h b/src/ext/yuni/src/yuni/core/system/stdint.h
@@ -34,23 +34,6 @@
 
 namespace Yuni
 {
-/*! 64-bit unsigned int, guaranteed to be 8 bytes in size */
-typedef uint64_t uint64_t;
-/*! 64-bit unsigned int, guaranteed to be 8 bytes in size */
-typedef int64_t int64_t;
-/*! 32-bit unsigned int, guaranteed to be 4 bytes in size */
-typedef uint32_t uint32_t;
-/*! 32-bit unsigned int, guaranteed to be 4 bytes in size */
-typedef int32_t int32_t;
-/*! 16-bit unsigned int, guaranteed to be 2 bytes in size */
-typedef uint16_t uint16;
-/*! 16-bit unsigned int, guaranteed to be 2 bytes in size */
-typedef int16_t int16_t;
-/*! 8-bit unsigned int, guaranteed to be 1 byte in size */
-typedef unsigned char uint8;
-/*! 8-bit unsigned int, guaranteed to be 1 byte in size */
-typedef char sint8;
-
 /*! unsigned char */
 typedef unsigned char uchar;
 
@@ -64,12 +47,6 @@ static const uint64_t AutoDetectNullChar = static_cast<uint64_t>(-1);
 /*! ssize_t */
 typedef int64_t ssize_t;
 #endif
-
-/*! Decimal floating-point (32 bits) */
-typedef float float32;
-/*! Decimal floating-point (32 bits) */
-typedef double float64;
-
 } /* namespace Yuni */
 
 #else /* Actually we have a C Compiler */
@@ -78,14 +55,6 @@ typedef double float64;
 
 #endif /* C++ Compiler */
 
-/* C types */
-
-// TODO REMOVE THIS GARBAGE
-/*! Decimal floating-point (32 bits) */
-typedef float yfloat32;
-/*! Decimal floating-point (32 bits) */
-typedef double yfloat64;
-
 /* Both C / C++ compiler */
 
 #ifndef YUNI_HAS_UINT

diff --git a/src/ext/yuni/src/yuni/io/file/stream.h b/src/ext/yuni/src/yuni/io/file/stream.h
@@ -311,7 +311,7 @@ class Stream final : private NonCopyable<Stream>
     //! Write an interger
     uint write(int64_t value);
     //! Write an interger
-    uint write(uint16 value);
+    uint write(uint16_t value);
     //! Write an interger
     uint write(uint32_t value);
     //! Write an interger
@@ -341,7 +341,7 @@ class Stream final : private NonCopyable<Stream>
     //! Write an interger
     uint write(int64_t value, uint64_t maxsize);
     //! Write an interger
-    uint write(uint16 value, uint64_t maxsize);
+    uint write(uint16_t value, uint64_t maxsize);
     //! Write an interger
     uint write(uint32_t value, uint64_t maxsize);
     //! Write an interger

diff --git a/src/ext/yuni/src/yuni/io/file/stream.hxx b/src/ext/yuni/src/yuni/io/file/stream.hxx
@@ -209,13 +209,13 @@ inline uint Stream::write(int64_t value, uint64_t maxsize)
                           pFd);
 }
 
-inline uint Stream::write(uint16 value)
+inline uint Stream::write(uint16_t value)
 {
     ShortString32 string(value);
     return (uint)::fwrite(string.c_str(), 1, string.size(), pFd);
 }
 
-inline uint Stream::write(uint16 value, uint64_t maxsize)
+inline uint Stream::write(uint16_t value, uint64_t maxsize)
 {
     ShortString32 string(value);
     return (uint)::fwrite(string.c_str(),

diff --git a/src/libs/antares/study/binding_constraint/BindingConstraintsRepository.cpp b/src/libs/antares/study/binding_constraint/BindingConstraintsRepository.cpp
@@ -242,15 +242,14 @@ void BindingConstraintsRepository::reverseWeightSign(const AreaLink* lnk)
     each([&lnk](BindingConstraint &constraint) { constraint.reverseWeightSign(lnk); });
 }
 
-Yuni::uint64_t BindingConstraintsRepository::memoryUsage() const
+uint64_t BindingConstraintsRepository::memoryUsage() const
 {
-    Yuni::uint64_t m = sizeof(BindingConstraintsRepository);
+    uint64_t m = sizeof(BindingConstraintsRepository);
     for (const auto & i : constraints_)
         m += i->memoryUsage();
     return m;
 }
 
-
 namespace // anonymous
 {
     template<class T>

diff --git a/src/ui/simulator/windows/output/panel/area-link.cpp b/src/ui/simulator/windows/output/panel/area-link.cpp
@@ -566,10 +566,10 @@ class JobAggregator : public Yuni::Job::IJob, public Yuni::IEventObserver<JobAgg
     std::vector<bool> colRowCaption;
     // The result matrix
     Matrix<double> ops;
-    Matrix<uint8> cellStatus;
+    Matrix<uint8_t> cellStatus;
     MatrixType headerColumns;
     MatrixType headerRows;
-    std::vector<uint8> precision;
+    std::vector<uint8_t> precision;
 }; // class JobAggregator
 
 class DataAreaOrLink : public Panel::IData