@@ -677,75 +677,75 @@ TEST(SimpleLRUMap, MapGet) {
677677TEST (SimpleLRUMap, MapGetPtr) {
678678 lru_map lru (2 );
679679
680- auto out = stl::mapGetPtr (as_const (lru), 0 );
680+ auto out = folly::get_ptr (as_const (lru), 0 );
681681 EXPECT_EQ (nullptr , out);
682682 checkContents (lru, {});
683683
684684 lru.set (0 , " 0" );
685685 checkContents (lru, {{0 , " 0" }});
686- out = stl::mapGetPtr (as_const (lru), 0 );
686+ out = folly::get_ptr (as_const (lru), 0 );
687687 EXPECT_NE (nullptr , out);
688688 EXPECT_EQ (" 0" , *out);
689689 checkContents (lru, {{0 , " 0" }});
690690
691691 lru.set (1 , " 1" );
692692 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
693- out = stl::mapGetPtr (as_const (lru), 1 );
693+ out = folly::get_ptr (as_const (lru), 1 );
694694 EXPECT_NE (nullptr , out);
695695 EXPECT_EQ (" 1" , *out);
696696 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
697- out = stl::mapGetPtr (as_const (lru), 0 );
697+ out = folly::get_ptr (as_const (lru), 0 );
698698 EXPECT_NE (nullptr , out);
699699 EXPECT_EQ (" 0" , *out);
700700 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
701701
702- out = stl::mapGetPtr (as_const (lru), 9 );
702+ out = folly::get_ptr (as_const (lru), 9 );
703703 EXPECT_EQ (nullptr , out);
704704 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
705705}
706706
707707TEST (SimpleLRUMap, MapGetDefault) {
708708 lru_map lru (2 );
709709
710- EXPECT_EQ (" x" , stl::mapGetDefault (lru, 0 , " x" ));
710+ EXPECT_EQ (" x" , folly::get_default (lru, 0 , " x" ));
711711 checkContents (lru, {});
712712
713713 lru.set (0 , " 0" );
714714 checkContents (lru, {{0 , " 0" }});
715- EXPECT_EQ (" 0" , stl::mapGetDefault (lru, 0 , " x" ));
715+ EXPECT_EQ (" 0" , folly::get_default (lru, 0 , " x" ));
716716 checkContents (lru, {{0 , " 0" }});
717717
718718 lru.set (1 , " 1" );
719719 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
720- EXPECT_EQ (" 1" , stl::mapGetDefault (lru, 1 , " x" ));
720+ EXPECT_EQ (" 1" , folly::get_default (lru, 1 , " x" ));
721721 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
722- EXPECT_EQ (" 0" , stl::mapGetDefault (lru, 0 , " x" ));
722+ EXPECT_EQ (" 0" , folly::get_default (lru, 0 , " x" ));
723723 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
724724
725- EXPECT_EQ (" x" , stl::mapGetDefault (lru, 9 , " x" ));
725+ EXPECT_EQ (" x" , folly::get_default (lru, 9 , " x" ));
726726 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
727727}
728728
729729TEST (SimpleLRUMap, MapGetRefDefault) {
730730 lru_map lru (2 );
731731
732732 const std::string x = " x" ;
733- EXPECT_EQ (" x" , stl::mapGetRefDefault (lru, 0 , x));
733+ EXPECT_EQ (" x" , folly::get_ref_default (lru, 0 , x));
734734 checkContents (lru, {});
735735
736736 lru.set (0 , " 0" );
737737 checkContents (lru, {{0 , " 0" }});
738- EXPECT_EQ (" 0" , stl::mapGetRefDefault (lru, 0 , x));
738+ EXPECT_EQ (" 0" , folly::get_ref_default (lru, 0 , x));
739739 checkContents (lru, {{0 , " 0" }});
740740
741741 lru.set (1 , " 1" );
742742 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
743- EXPECT_EQ (" 1" , stl::mapGetRefDefault (lru, 1 , x));
743+ EXPECT_EQ (" 1" , folly::get_ref_default (lru, 1 , x));
744744 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
745- EXPECT_EQ (" 0" , stl::mapGetRefDefault (lru, 0 , x));
745+ EXPECT_EQ (" 0" , folly::get_ref_default (lru, 0 , x));
746746 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
747747
748- EXPECT_EQ (" x" , stl::mapGetRefDefault (lru, 9 , x));
748+ EXPECT_EQ (" x" , folly::get_ref_default (lru, 9 , x));
749749 checkContents (lru, {{1 , " 1" }, {0 , " 0" }});
750750}
751751
0 commit comments