From 800cec49aeaedbf5355557fc1b300a3b7a1be46d Mon Sep 17 00:00:00 2001 From: Fred Hornsey Date: Tue, 15 Jun 2021 13:35:07 -0500 Subject: [PATCH] s/Uint/UInt/g --- ACE/ace/CDR_Base.h | 6 +++--- TAO/tao/Basic_Types.h | 12 ++++++------ TAO/tests/IDLv4/explicit_ints/main.cpp | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ACE/ace/CDR_Base.h b/ACE/ace/CDR_Base.h index 6fb61edfe8a..84085cf4482 100644 --- a/ACE/ace/CDR_Base.h +++ b/ACE/ace/CDR_Base.h @@ -210,11 +210,11 @@ public: typedef ACE_INT8 Int8; typedef ACE_UINT8 UInt8; typedef Short Int16; - typedef UShort Uint16; + typedef UShort UInt16; typedef Long Int32; - typedef ULong Uint32; + typedef ULong UInt32; typedef LongLong Int64; - typedef ULongLong Uint64; + typedef ULongLong UInt64; # if ACE_SIZEOF_FLOAT == 4 typedef float Float; diff --git a/TAO/tao/Basic_Types.h b/TAO/tao/Basic_Types.h index 31e9031dd73..e7b47810037 100644 --- a/TAO/tao/Basic_Types.h +++ b/TAO/tao/Basic_Types.h @@ -85,20 +85,20 @@ namespace CORBA typedef ACE_CDR::Int16 Int16; typedef Int16 &Int16_out; - typedef ACE_CDR::Uint16 Uint16; - typedef Uint16 &Uint16_out; + typedef ACE_CDR::UInt16 UInt16; + typedef UInt16 &UInt16_out; typedef ACE_CDR::Int32 Int32; typedef Int32 &Int32_out; - typedef ACE_CDR::Uint32 Uint32; - typedef Uint32 &Uint32_out; + typedef ACE_CDR::UInt32 UInt32; + typedef UInt32 &UInt32_out; typedef ACE_CDR::Int64 Int64; typedef Int64 &Int64_out; - typedef ACE_CDR::Uint64 Uint64; - typedef Uint64 &Uint64_out; + typedef ACE_CDR::UInt64 UInt64; + typedef UInt64 &UInt64_out; //@} typedef TAO::String_var String_var; diff --git a/TAO/tests/IDLv4/explicit_ints/main.cpp b/TAO/tests/IDLv4/explicit_ints/main.cpp index 075608ee540..5d1aa20081a 100644 --- a/TAO/tests/IDLv4/explicit_ints/main.cpp +++ b/TAO/tests/IDLv4/explicit_ints/main.cpp @@ -37,13 +37,13 @@ ACE_TMAIN (int, ACE_TCHAR *[]) expect_equals (any_failed, "u8_max", u8_max, 255); expect_equals (any_failed, "i8_min", i8_min, -128); expect_equals (any_failed, "i8_max", i8_max, 127); - expect_equals (any_failed, "u16_max", u16_max, 65535); + expect_equals (any_failed, "u16_max", u16_max, 65535); expect_equals (any_failed, "i16_min", i16_min, -32768); expect_equals (any_failed, "i16_max", i16_max, 32767); - expect_equals (any_failed, "u32_max", u32_max, 4294967295); + expect_equals (any_failed, "u32_max", u32_max, 4294967295); expect_equals (any_failed, "i32_min", i32_min, -2147483648); expect_equals (any_failed, "i32_max", i32_max, 2147483647); - expect_equals (any_failed, "u64_max", u64_max, 18446744073709551615ULL); + expect_equals (any_failed, "u64_max", u64_max, 18446744073709551615ULL); expect_equals (any_failed, "i64_min", i64_min, (-9223372036854775807 - 1)); expect_equals (any_failed, "i64_max", i64_max, 9223372036854775807); -- 2.11.4.GIT