Merge branch 'randomShuffle.CaloEvent-20190416' into 'master'

CaloEvent: Remove references to std::random_shuffle.

See merge request atlas/athena!22735

Calorimeter/CaloEvent/test/CaloCellContainerTestCommon.icc

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id$
@@ -19,7 +19,7 @@
 
 
 //using Athena_test::randi;
-Athena_test::RNG stlrand;
+Athena_test::URNG stlrand;
 
 
 void fill_cells1 (CellVector selected_cells[],
@@ -31,7 +31,7 @@ void fill_cells1 (CellVector selected_cells[],
       all_cells.push_back (selected_cells[i][j]);
   }
 
-  std::random_shuffle (all_cells.begin(), all_cells.end(), stlrand);
+  std::shuffle (all_cells.begin(), all_cells.end(), stlrand);
 
   for (size_t i = 0; i < all_cells.size(); i++)
     cont.push_back (all_cells[i]);
@@ -44,7 +44,7 @@ void fill_cells2 (CellVector selected_cells[],
   CellVector all_cells;
   for (int i=0; i < CaloCell_ID::NSUBCALO; i++) {
     CellVector vv = selected_cells[i];
-    std::random_shuffle (vv.begin(), vv.end(), stlrand);
+    std::shuffle (vv.begin(), vv.end(), stlrand);
 
     if (vv.size() > 0)
       cont.setHasCalo (static_cast<CaloCell_ID::SUBCALO> (i));