From ebe918aa9c35f4eadd204874e9deded1224cea8b Mon Sep 17 00:00:00 2001 From: Alexander Beels Date: Fri, 10 Feb 2017 17:18:59 -0500 Subject: [PATCH] Adopt commit 9fa6cc7 from master: Merge pull request #985 from abeels/oss-trait-cleanup-review commit 9fa6cc72a13cd1771a9205e4ecd82cb5250a44ee Merge: 69c459e ad2cf71 Author: Alexander Beels Date: Fri Feb 10 17:18:59 2017 -0500 Merge pull request #985 from abeels/oss-trait-cleanup-review Oss trait cleanup review commit ad2cf7111a21980dba76dd8b5ab9a52a5f2a05b4 Author: Alexander Beels Date: Fri Feb 10 16:55:39 2017 -0500 Test traits of enums contained in 'my_Enum*' test types. * '::Value' had been elided during conversion from 'bslalg' idiom. commit 35cb436cc3ab8c91eb8695a8787dd273abbe9ac5 Author: Alexander Beels Date: Thu Feb 9 18:25:11 2017 -0500 Add missing includes for new traits. commit 5d7638c6995b1058c57d2317ae33a62ce059a333 Author: Alexander Beels Date: Thu Feb 9 18:20:08 2017 -0500 Respond to (verbal) review comments. commit f3d9826d34d0863dc1f97fdb3815fdf5c0cca352 Merge: 4eedbe3 818c76a Author: Alexander Beels Date: Thu Feb 9 17:36:21 2017 -0500 [IMPORT] Assemble internal version of oss-trait-cleanup based on mergebase with master commit 818c76a5b84f589bc18253bd725a1ce322185de3 Author: Alexander Beels Date: Thu Feb 9 17:25:16 2017 -0500 Clean up remnant bslalg references/dependencies. commit 5466fc487bde6d8839c39ec10312b18825f4b730 Author: Alexander Beels Date: Thu Feb 9 16:22:27 2017 -0500 fix uses of HasTrait --- groups/bal/balst/balst_stacktrace.t.cpp | 9 +- .../balst_stacktraceresolverimpl_elf.cpp | 6 +- groups/bal/baltzo/baltzo_localdatetime.t.cpp | 8 +- .../baltzo/baltzo_localtimedescriptor.t.cpp | 8 +- .../bal/baltzo/baltzo_localtimeperiod.t.cpp | 8 +- groups/bdl/bdlat/bdlat_attributeinfo.h | 8 ++ groups/bdl/bdlat/bdlat_enumeratorinfo.h | 8 ++ groups/bdl/bdlat/bdlat_selectioninfo.h | 8 ++ groups/bdl/bdlat/bdlat_typetraits.t.cpp | 123 +++++++++--------- groups/bdl/bdlc/bdlc_hashtable.h | 28 ++-- groups/bdl/bdlcc/bdlcc_objectcatalog.t.cpp | 6 +- groups/bdl/bdlcc/bdlcc_sharedobjectpool.t.cpp | 7 +- .../btl/btlmt/btlmt_channelpoolchannel.t.cpp | 6 +- groups/btl/btlmt/btlmt_sessionpool.t.cpp | 17 +-- 14 files changed, 138 insertions(+), 112 deletions(-) diff --git a/groups/bal/balst/balst_stacktrace.t.cpp b/groups/bal/balst/balst_stacktrace.t.cpp index 297a6d3b4d..800053b54e 100644 --- a/groups/bal/balst/balst_stacktrace.t.cpp +++ b/groups/bal/balst/balst_stacktrace.t.cpp @@ -15,6 +15,9 @@ #include #include #include +#include + +#include #include #include @@ -277,10 +280,8 @@ const Element &V0 = VALUES[0], &VA = V0, // 'V0', 'V1', ... are used in // TYPE TRAITS // ---------------------------------------------------------------------------- -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); +BSLMF_ASSERT(bslmf::IsBitwiseMoveable::value); +BSLMF_ASSERT(bslma::UsesBslmaAllocator::value); // ============================================================================ // TEST APPARATUS diff --git a/groups/bal/balst/balst_stacktraceresolverimpl_elf.cpp b/groups/bal/balst/balst_stacktraceresolverimpl_elf.cpp index 33c7dad1a1..7712bf8870 100644 --- a/groups/bal/balst/balst_stacktraceresolverimpl_elf.cpp +++ b/groups/bal/balst/balst_stacktraceresolverimpl_elf.cpp @@ -22,6 +22,9 @@ BSLS_IDENT_RCSID(balst_stacktraceresolverimpl_elf_cpp,"$Id$ $CSID$") #include #include +#include +#include + #include #include @@ -991,8 +994,7 @@ class FrameRec { bool d_isSymbolResolved; public: - BSLALG_DECLARE_NESTED_TRAITS(u::FrameRec, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(u::FrameRec, bslma::UsesBslmaAllocator); // CREATORS FrameRec(const void *address, diff --git a/groups/bal/baltzo/baltzo_localdatetime.t.cpp b/groups/bal/baltzo/baltzo_localdatetime.t.cpp index 92ceddd63f..ef5063667d 100644 --- a/groups/bal/baltzo/baltzo_localdatetime.t.cpp +++ b/groups/bal/baltzo/baltzo_localdatetime.t.cpp @@ -11,8 +11,10 @@ #include #include #include +#include #include +#include #include #include @@ -224,10 +226,8 @@ static bool someDiff(const Obj& a, const Obj& b) // TYPE TRAITS // ---------------------------------------------------------------------------- -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); +BSLMF_ASSERT(bslmf::IsBitwiseMoveable::value); +BSLMF_ASSERT(bslma::UsesBslmaAllocator::value); // ============================================================================ // GLOBAL CONSTANTS USED FOR TESTING diff --git a/groups/bal/baltzo/baltzo_localtimedescriptor.t.cpp b/groups/bal/baltzo/baltzo_localtimedescriptor.t.cpp index 1ca7329a9a..4bcac226ae 100644 --- a/groups/bal/baltzo/baltzo_localtimedescriptor.t.cpp +++ b/groups/bal/baltzo/baltzo_localtimedescriptor.t.cpp @@ -10,8 +10,10 @@ #include #include #include +#include #include +#include #include #include @@ -199,10 +201,8 @@ typedef baltzo::LocalTimeDescriptor Obj; // TYPE TRAITS // ---------------------------------------------------------------------------- -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); +BSLMF_ASSERT(bslmf::IsBitwiseMoveable::value); +BSLMF_ASSERT(bslma::UsesBslmaAllocator::value); // ============================================================================ // GLOBAL TEST DATA diff --git a/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp b/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp index c02965152f..6f6d2653f3 100644 --- a/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp +++ b/groups/bal/baltzo/baltzo_localtimeperiod.t.cpp @@ -8,8 +8,10 @@ #include #include #include +#include #include +#include #include @@ -209,10 +211,8 @@ typedef bdlt::Datetime T3; // 'utcEndTime' // TYPE TRAITS // ---------------------------------------------------------------------------- -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); -BSLMF_ASSERT((bslalg::HasTrait::VALUE)); +BSLMF_ASSERT(bslmf::IsBitwiseMoveable::value); +BSLMF_ASSERT(bslma::UsesBslmaAllocator::value); // ============================================================================ // GLOBAL CONSTANTS USED FOR TESTING diff --git a/groups/bdl/bdlat/bdlat_attributeinfo.h b/groups/bdl/bdlat/bdlat_attributeinfo.h index 7ed9c2f9e6..7c2c9f513c 100644 --- a/groups/bdl/bdlat/bdlat_attributeinfo.h +++ b/groups/bdl/bdlat/bdlat_attributeinfo.h @@ -82,6 +82,14 @@ BSLS_IDENT("$Id: $") #include #endif +#ifndef INCLUDED_BSLMF_ISTRIVIALLYCOPYABLE +#include +#endif + +#ifndef INCLUDED_BSLMF_ISTRIVIALLYDEFAULTCONSTRUCTIBLE +#include +#endif + #ifndef INCLUDED_BSLMF_NESTEDTRAITDECLARATION #include #endif diff --git a/groups/bdl/bdlat/bdlat_enumeratorinfo.h b/groups/bdl/bdlat/bdlat_enumeratorinfo.h index 5bca4e73bc..e86fd5f972 100644 --- a/groups/bdl/bdlat/bdlat_enumeratorinfo.h +++ b/groups/bdl/bdlat/bdlat_enumeratorinfo.h @@ -41,6 +41,14 @@ BSLS_IDENT("$Id: $") #include #endif +#ifndef INCLUDED_BSLMF_ISTRIVIALLYCOPYABLE +#include +#endif + +#ifndef INCLUDED_BSLMF_ISTRIVIALLYDEFAULTCONSTRUCTIBLE +#include +#endif + #ifndef INCLUDED_BSLMF_NESTEDTRAITDECLARATION #include #endif diff --git a/groups/bdl/bdlat/bdlat_selectioninfo.h b/groups/bdl/bdlat/bdlat_selectioninfo.h index 7a91f06cb2..2d1af8f964 100644 --- a/groups/bdl/bdlat/bdlat_selectioninfo.h +++ b/groups/bdl/bdlat/bdlat_selectioninfo.h @@ -82,6 +82,14 @@ BSLS_IDENT("$Id: $") #include #endif +#ifndef INCLUDED_BSLMF_ISTRIVIALLYCOPYABLE +#include +#endif + +#ifndef INCLUDED_BSLMF_ISTRIVIALLYDEFAULTCONSTRUCTIBLE +#include +#endif + #ifndef INCLUDED_BSLMF_NESTEDTRAITDECLARATION #include #endif diff --git a/groups/bdl/bdlat/bdlat_typetraits.t.cpp b/groups/bdl/bdlat/bdlat_typetraits.t.cpp index 2b48a17ab1..756beb9868 100644 --- a/groups/bdl/bdlat/bdlat_typetraits.t.cpp +++ b/groups/bdl/bdlat/bdlat_typetraits.t.cpp @@ -13,6 +13,11 @@ #include #include + +#include + +#include + #include #include @@ -225,10 +230,8 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT(! bslmf::IsBitwiseMoveable::value); + ASSERT(! bslma::UsesBslmaAllocator::value); if (verbose) cout << "\tChoice types." << endl; @@ -242,10 +245,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT(! bslmf::IsBitwiseMoveable< + my_ClassWithBasicChoiceTraits>::value); + ASSERT(! bslma::UsesBslmaAllocator< + my_ClassWithBasicChoiceTraits>::value); ASSERT( (bslalg::HasTrait::VALUE)); @@ -257,10 +260,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); + ASSERT(! bslmf::IsBitwiseMoveable< + my_ClassWithBasicChoiceAllocTraits>::value); + ASSERT( bslma::UsesBslmaAllocator< + my_ClassWithBasicChoiceAllocTraits>::value); ASSERT( (bslalg::HasTrait::VALUE)); @@ -272,10 +275,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable< + my_ClassWithBasicChoiceBitwiseTraits>::value); + ASSERT(! bslma::UsesBslmaAllocator< + my_ClassWithBasicChoiceBitwiseTraits>::value); ASSERT( (bslalg::HasTrait::VALUE)); @@ -287,10 +290,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable< + my_ClassWithBasicChoiceAllocBitwiseTraits>::value); + ASSERT( bslma::UsesBslmaAllocator< + my_ClassWithBasicChoiceAllocBitwiseTraits>::value); if (verbose) cout << "\tSequence types." << endl; @@ -304,10 +307,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT(! bslmf::IsBitwiseMoveable< + my_ClassWithBasicSequenceTraits>::value); + ASSERT(! bslma::UsesBslmaAllocator< + my_ClassWithBasicSequenceTraits>::value); ASSERT(! (bslalg::HasTrait::VALUE)); @@ -319,10 +322,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); + ASSERT(! bslmf::IsBitwiseMoveable< + my_ClassWithBasicSequenceAllocTraits>::value); + ASSERT( bslma::UsesBslmaAllocator< + my_ClassWithBasicSequenceAllocTraits>::value); ASSERT(! (bslalg::HasTrait::VALUE)); @@ -334,10 +337,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable< + my_ClassWithBasicSequenceBitwiseTraits>::value); + ASSERT(! bslma::UsesBslmaAllocator< + my_ClassWithBasicSequenceBitwiseTraits>::value); ASSERT(! (bslalg::HasTrait::VALUE)); @@ -349,10 +352,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable< + my_ClassWithBasicSequenceAllocBitwiseTraits>::value); + ASSERT( bslma::UsesBslmaAllocator< + my_ClassWithBasicSequenceAllocBitwiseTraits>::value); if (verbose) cout << "\tEnum types." << endl; @@ -366,10 +369,8 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable::value); + ASSERT(! bslma::UsesBslmaAllocator::value); ASSERT(! (bslalg::HasTrait::VALUE)); @@ -381,10 +382,8 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable::value); + ASSERT(! bslma::UsesBslmaAllocator::value); if (verbose) cout << "\tCustomized types." << endl; @@ -398,10 +397,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); + ASSERT(! bslmf::IsBitwiseMoveable< + my_ClassWithBasicCustomizedTypeTraits>::value); + ASSERT(! bslma::UsesBslmaAllocator< + my_ClassWithBasicCustomizedTypeTraits>::value); ASSERT(! (bslalg::HasTrait::VALUE)); @@ -413,10 +412,10 @@ int main(int argc, char *argv[]) bdlat_TypeTraitBasicSequence>::VALUE)); ASSERT( (bslalg::HasTrait::VALUE)); - ASSERT(! (bslalg::HasTrait::VALUE)); - ASSERT( (bslalg::HasTrait::VALUE)); + ASSERT(! bslmf::IsBitwiseMoveable< + my_ClassWithBasicCustomizedTypeAllocTraits>::value); + ASSERT( bslma::UsesBslmaAllocator< + my_ClassWithBasicCustomizedTypeAllocTraits>::value); ASSERT(! (bslalg::HasTrait< my_ClassWithBasicCustomizedTypeBitwiseTraits, @@ -433,12 +432,10 @@ int main(int argc, char *argv[]) ASSERT( (bslalg::HasTrait< my_ClassWithBasicCustomizedTypeBitwiseTraits, bdlb::TypeTraitHasPrintMethod>::VALUE)); - ASSERT( (bslalg::HasTrait< - my_ClassWithBasicCustomizedTypeBitwiseTraits, - bslalg::TypeTraitBitwiseMoveable>::VALUE)); - ASSERT(! (bslalg::HasTrait< - my_ClassWithBasicCustomizedTypeBitwiseTraits, - bslalg::TypeTraitUsesBslmaAllocator>::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable< + my_ClassWithBasicCustomizedTypeBitwiseTraits>::value); + ASSERT(! bslma::UsesBslmaAllocator< + my_ClassWithBasicCustomizedTypeBitwiseTraits>::value); ASSERT(! (bslalg::HasTrait< my_ClassWithBasicCustomizedTypeAllocBitwiseTraits, @@ -455,12 +452,10 @@ int main(int argc, char *argv[]) ASSERT( (bslalg::HasTrait< my_ClassWithBasicCustomizedTypeAllocBitwiseTraits, bdlb::TypeTraitHasPrintMethod>::VALUE)); - ASSERT( (bslalg::HasTrait< - my_ClassWithBasicCustomizedTypeAllocBitwiseTraits, - bslalg::TypeTraitBitwiseMoveable>::VALUE)); - ASSERT( (bslalg::HasTrait< - my_ClassWithBasicCustomizedTypeAllocBitwiseTraits, - bslalg::TypeTraitUsesBslmaAllocator>::VALUE)); + ASSERT( bslmf::IsBitwiseMoveable< + my_ClassWithBasicCustomizedTypeAllocBitwiseTraits>::value); + ASSERT( bslma::UsesBslmaAllocator< + my_ClassWithBasicCustomizedTypeAllocBitwiseTraits>::value); } break; default: { diff --git a/groups/bdl/bdlc/bdlc_hashtable.h b/groups/bdl/bdlc/bdlc_hashtable.h index fd7f742588..48905c2b45 100644 --- a/groups/bdl/bdlc/bdlc_hashtable.h +++ b/groups/bdl/bdlc/bdlc_hashtable.h @@ -575,10 +575,6 @@ BSLS_IDENT("$Id: $") #include #endif -#ifndef INCLUDED_BSLMF_NESTEDTRAITDECLARATION -#include -#endif - #ifndef INCLUDED_BSLMF_ASSERT #include #endif @@ -591,6 +587,14 @@ BSLS_IDENT("$Id: $") #include #endif +#ifndef INCLUDED_BSLMF_ISTRIVIALLYDEFAULTCONSTRUCTIBLE +#include +#endif + +#ifndef INCLUDED_BSLMF_NESTEDTRAITDECLARATION +#include +#endif + #ifndef INCLUDED_BSLMF_NIL #include #endif @@ -1377,9 +1381,7 @@ inline bool bdlc::HashTableDefaultTraits::isNull(const BUCKET& bucket) { enum { - k_IS_POD = bslalg::HasTrait< - BUCKET, - bslalg::TypeTraitHasTrivialDefaultConstructor>::VALUE + k_IS_POD = bsl::is_trivially_default_constructible::value }; BSLMF_ASSERT(k_IS_POD); @@ -1418,9 +1420,7 @@ void bdlc::HashTableDefaultTraits::setToNull(BUCKET *bucket) BSLS_ASSERT_SAFE(bucket); enum { - k_IS_POD = bslalg::HasTrait< - BUCKET, - bslalg::TypeTraitHasTrivialDefaultConstructor>::VALUE + k_IS_POD = bsl::is_trivially_default_constructible::value }; BSLMF_ASSERT(k_IS_POD); @@ -1462,9 +1462,7 @@ inline bool bdlc::HashTableDefaultTraits::isRemoved(const BUCKET& bucket) { enum { - k_IS_POD = bslalg::HasTrait< - BUCKET, - bslalg::TypeTraitHasTrivialDefaultConstructor>::VALUE + k_IS_POD = bsl::is_trivially_default_constructible::value }; BSLMF_ASSERT(k_IS_POD); @@ -1511,9 +1509,7 @@ void bdlc::HashTableDefaultTraits::setToRemoved(BUCKET *bucket) BSLS_ASSERT_SAFE(bucket); enum { - k_IS_POD = bslalg::HasTrait< - BUCKET, - bslalg::TypeTraitHasTrivialDefaultConstructor>::VALUE + k_IS_POD = bsl::is_trivially_default_constructible::value }; BSLMF_ASSERT(k_IS_POD); diff --git a/groups/bdl/bdlcc/bdlcc_objectcatalog.t.cpp b/groups/bdl/bdlcc/bdlcc_objectcatalog.t.cpp index f0d1e273d6..2535c36727 100644 --- a/groups/bdl/bdlcc/bdlcc_objectcatalog.t.cpp +++ b/groups/bdl/bdlcc/bdlcc_objectcatalog.t.cpp @@ -23,6 +23,9 @@ #include #include +#include + +#include #include #include @@ -845,8 +848,7 @@ class AllocPattern { public: // TRAITS - BSLALG_DECLARE_NESTED_TRAITS(AllocPattern, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(AllocPattern, bslma::UsesBslmaAllocator); static int objCount; diff --git a/groups/bdl/bdlcc/bdlcc_sharedobjectpool.t.cpp b/groups/bdl/bdlcc/bdlcc_sharedobjectpool.t.cpp index d64ef50aff..8b11f6e05f 100644 --- a/groups/bdl/bdlcc/bdlcc_sharedobjectpool.t.cpp +++ b/groups/bdl/bdlcc/bdlcc_sharedobjectpool.t.cpp @@ -29,6 +29,9 @@ #include #include #include +#include + +#include #include #include @@ -547,8 +550,8 @@ struct ConstructorTestHelp1a {} // TRAITS - BSLALG_DECLARE_NESTED_TRAITS(ConstructorTestHelp1a, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(ConstructorTestHelp1a, + bslma::UsesBslmaAllocator); // ACCESSORS void reset(); diff --git a/groups/btl/btlmt/btlmt_channelpoolchannel.t.cpp b/groups/btl/btlmt/btlmt_channelpoolchannel.t.cpp index 5dd4d2f6a6..d535afc3b6 100644 --- a/groups/btl/btlmt/btlmt_channelpoolchannel.t.cpp +++ b/groups/btl/btlmt/btlmt_channelpoolchannel.t.cpp @@ -28,6 +28,9 @@ #include #include #include +#include + +#include #include @@ -522,8 +525,7 @@ class my_Server { public: // TRAITS - BSLALG_DECLARE_NESTED_TRAITS(my_Server, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(my_Server, bslma::UsesBslmaAllocator); // CREATORS my_Server(const btlmt::ChannelPoolConfiguration& config, diff --git a/groups/btl/btlmt/btlmt_sessionpool.t.cpp b/groups/btl/btlmt/btlmt_sessionpool.t.cpp index f39516da18..b5e62e30a3 100644 --- a/groups/btl/btlmt/btlmt_sessionpool.t.cpp +++ b/groups/btl/btlmt/btlmt_sessionpool.t.cpp @@ -19,6 +19,9 @@ #include #include +#include + +#include #include #include @@ -554,8 +557,7 @@ class TestFactory : public btlmt::SessionFactory { public: // TRAITS - BSLALG_DECLARE_NESTED_TRAITS(TestFactory, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(TestFactory, bslma::UsesBslmaAllocator); // CREATORS TestFactory(BlobReadCallback *callback = 0, @@ -1107,8 +1109,7 @@ class TesterFactory : public btlmt::SessionFactory { enum { LISTENER = 0, CONNECTOR }; // TRAITS - BSLALG_DECLARE_NESTED_TRAITS(TesterFactory, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(TesterFactory, bslma::UsesBslmaAllocator); // CREATORS TesterFactory(int mode, @@ -1500,8 +1501,8 @@ namespace BTLMT_SESSION_POOL_USAGE_EXAMPLE { public: // TRAITS - BSLALG_DECLARE_NESTED_TRAITS(my_EchoSessionFactory, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(my_EchoSessionFactory, + bslma::UsesBslmaAllocator); // CREATORS my_EchoSessionFactory(bslma::Allocator *basicAllocator = 0); @@ -1666,8 +1667,8 @@ namespace BTLMT_SESSION_POOL_USAGE_EXAMPLE { public: // TRAITS - BSLALG_DECLARE_NESTED_TRAITS(my_EchoServer, - bslalg::TypeTraitUsesBslmaAllocator); + BSLMF_NESTED_TRAIT_DECLARATION(my_EchoServer, + bslma::UsesBslmaAllocator); // CREATORS my_EchoServer(bslmt::Mutex *coutLock,