Merge branch 'stream.xAODMetaData-20201215' into 'master'

xAODMetaData: Fix operator<< definition.

See merge request atlas/athena!39219

Event/xAOD/xAODMetaData/Root/FileMetaData_v1.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: FileMetaData_v1.cxx 683694 2015-07-17 09:03:52Z krasznaa $
@@ -362,8 +362,6 @@ namespace xAOD {
       return true;
    }
 
-} // namespace xAOD
-
 /// Helper macro used to print MetaDataType values
 #define PRINT_TYPE( TYPE )                      \
    case xAOD::FileMetaData_v1::TYPE:            \
@@ -404,3 +402,5 @@ std::ostream& operator<< ( std::ostream& out,
    return out;
 }
 
+
+} // namespace xAOD

Event/xAOD/xAODMetaData/xAODMetaData/versions/FileMetaData_v1.h

 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // $Id: FileMetaData_v1.h 685184 2015-07-23 20:25:43Z cranshaw $
@@ -106,11 +106,11 @@ namespace xAOD {
 
    }; // class FileMetaData_v1
 
-} // namespace xAOD
+   /// A convenience print operator for xAOD::FileMetaData_v1::MetaDataType
+   std::ostream& operator<< ( std::ostream& out,
+                              xAOD::FileMetaData_v1::MetaDataType type );
 
-/// A convenience print operator for xAOD::FileMetaData_v1::MetaDataType
-std::ostream& operator<< ( std::ostream& out,
-                           xAOD::FileMetaData_v1::MetaDataType type );
+} // namespace xAOD
 
 // Declare a base class for the type:
 #include "xAODCore/BaseInfo.h"