7 files changed, 9 insertions, 9 deletions
diff --git a/searchsummary/src/tests/juniper/auxTest.cpp b/searchsummary/src/tests/juniper/auxTest.cpp
index ef22b0542af..8eda6a2132a 100644
--- a/searchsummary/src/tests/juniper/auxTest.cpp
+++ b/searchsummary/src/tests/juniper/auxTest.cpp
@@ -664,7 +664,7 @@ AuxTest::assertChar(ucs4_t act, char exp)
     return _test((char) act == exp);
 }
 
-typedef std::unique_ptr<QueryNode> QueryNodeUP;
+using QueryNodeUP = std::unique_ptr<QueryNode>;
 struct QB {
     QueryNodeUP q;
     QB(size_t numTerms) : q(new QueryNode(numTerms, 0, 0)) {}
@@ -694,7 +694,7 @@ void
 AuxTest::TestSpecialTokenRegistry()
 {
     {
-        typedef SpecialTokenRegistry::CharStream CharStream;
+        using CharStream = SpecialTokenRegistry::CharStream;
         ucs4_t buf[16];
         {
             std::string text = " c+-";
diff --git a/searchsummary/src/tests/juniper/auxTest.h b/searchsummary/src/tests/juniper/auxTest.h
index 9ff391911b3..70d7c8e6d23 100644
--- a/searchsummary/src/tests/juniper/auxTest.h
+++ b/searchsummary/src/tests/juniper/auxTest.h
@@ -17,7 +17,7 @@ public:
     virtual ~AuxTest();
 
     typedef void(AuxTest::* tst_method_ptr) ();
-    typedef std::map<std::string, tst_method_ptr> MethodContainer;
+    using MethodContainer = std::map<std::string, tst_method_ptr>;
     MethodContainer test_methods_;
     void init();
 
diff --git a/searchsummary/src/tests/juniper/latintokenizertest.h b/searchsummary/src/tests/juniper/latintokenizertest.h
index b4d113918ee..d06a3ae9289 100644
--- a/searchsummary/src/tests/juniper/latintokenizertest.h
+++ b/searchsummary/src/tests/juniper/latintokenizertest.h
@@ -371,7 +371,7 @@ private:
 void LatinTokenizerTest::TestTypeparamObservers()
 {
 
-    typedef Fast_LatinTokenizer<TPS,TPS> MyTokenizer;
+    using MyTokenizer = Fast_LatinTokenizer<TPS,TPS>;
 
     PushDesc("TypeparamObservers\n");
     std::string text("4Some6text");
@@ -390,7 +390,7 @@ void LatinTokenizerTest::TestTypeparamObservers()
 void LatinTokenizerTest::TestMapelURL()
 {
 
-    typedef Fast_LatinTokenizer<Maple_Space, Mapel_Pucntuation> MyTokenizer;
+    using MyTokenizer = Fast_LatinTokenizer<Maple_Space, Mapel_Pucntuation>;
 
     PushDesc("MapelURL\n");
     std::string text("http://search.msn.co.uk/results.asp?q= cfg=SMCBROWSE rn=1825822 dp=1873075 v=166:");
diff --git a/searchsummary/src/tests/juniper/matchobjectTest.h b/searchsummary/src/tests/juniper/matchobjectTest.h
index 9fdd3e4719f..f85973e7dd6 100644
--- a/searchsummary/src/tests/juniper/matchobjectTest.h
+++ b/searchsummary/src/tests/juniper/matchobjectTest.h
@@ -74,7 +74,7 @@ class MatchObjectTest : public Test {
     void tearDown();
 
     typedef void(MatchObjectTest::* tst_method_ptr) ();
-    typedef std::map<std::string, tst_method_ptr> MethodContainer;
+    using MethodContainer = std::map<std::string, tst_method_ptr>;
     MethodContainer test_methods_;
     void init();
 
diff --git a/searchsummary/src/tests/juniper/mcandTest.h b/searchsummary/src/tests/juniper/mcandTest.h
index 6eb8b4d66e5..37613c6b9ab 100644
--- a/searchsummary/src/tests/juniper/mcandTest.h
+++ b/searchsummary/src/tests/juniper/mcandTest.h
@@ -172,7 +172,7 @@ class MatchCandidateTest : public Test {
     void tearDown();
 
     typedef void(MatchCandidateTest::* tst_method_ptr) ();
-    typedef std::map<std::string, tst_method_ptr> MethodContainer;
+    using MethodContainer = std::map<std::string, tst_method_ptr>;
     MethodContainer test_methods_;
     void init();
 protected:
diff --git a/searchsummary/src/tests/juniper/queryparserTest.h b/searchsummary/src/tests/juniper/queryparserTest.h
index 803fbd4c999..45d2e966e99 100644
--- a/searchsummary/src/tests/juniper/queryparserTest.h
+++ b/searchsummary/src/tests/juniper/queryparserTest.h
@@ -73,7 +73,7 @@ class QueryParserTest : public Test {
     void tearDown();
 
     typedef void(QueryParserTest::* tst_method_ptr) ();
-    typedef std::map<std::string, tst_method_ptr> MethodContainer;
+    using MethodContainer = std::map<std::string, tst_method_ptr>;
     MethodContainer test_methods_;
     void init();
 
diff --git a/searchsummary/src/tests/juniper/testenv.h b/searchsummary/src/tests/juniper/testenv.h
index f723fb96602..11b975d0888 100644
--- a/searchsummary/src/tests/juniper/testenv.h
+++ b/searchsummary/src/tests/juniper/testenv.h
@@ -66,5 +66,5 @@ extern Juniper * _Juniper;
 
 } // end namespace juniper
 
-typedef juniper::TestQuery TestQuery;
+using TestQuery = juniper::TestQuery;