Skip to content
Snippets Groups Projects
Commit 7fab5188 authored by Marco Cattaneo's avatar Marco Cattaneo
Browse files

Fix compilation warnings

parent 70c3fe4c
No related branches found
No related tags found
1 merge request!579Fix compilation warnings
Pipeline #1374222 passed
/*****************************************************************************\
* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration *
* (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration *
* *
* This software is distributed under the terms of the GNU General Public *
* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". *
......@@ -8,8 +8,6 @@
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
\*****************************************************************************/
// $Id$
// ============================================================================
#ifndef ANALYSIS_TEE_H
#define ANALYSIS_TEE_H 1
// ============================================================================
......@@ -67,11 +65,11 @@ namespace Gaudi
private:
// ======================================================================
/// the file itself
std::auto_ptr<std::ostream> m_file ; // the file itself
std::unique_ptr<std::ostream> m_file ; // the file itself
/// is the file owned?
bool m_own ; // is the file owned?
std::auto_ptr<std::streambuf> m_buffer ;
std::streambuf* m_keep ; // keep the standard buffer
bool m_own ; // is the file owned?
std::unique_ptr<std::streambuf> m_buffer ;
std::streambuf* m_keep ; // keep the standard buffer
// ======================================================================
};
// ========================================================================
......
/*****************************************************************************\
* (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration *
* (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration *
* *
* This software is distributed under the terms of the GNU General Public *
* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". *
......@@ -8,7 +8,6 @@
* granted to it by virtue of its status as an Intergovernmental Organization *
* or submit itself to any jurisdiction. *
\*****************************************************************************/
// $Id$
// ============================================================================
// Include
// ============================================================================
......@@ -27,10 +26,6 @@
* @see Gaudi::Utils::Mute
* @author Vanya BELYAEV Ivan.Belyaev@itep.ru
* @date 2013-07-07
*
* Version $Revision$
* Last Modification $Date$
* by $Author$
*/
// ============================================================================
namespace std
......@@ -131,10 +126,9 @@ namespace std
Gaudi::Utils::Tee::Tee ( const std::string& filename )
: m_file ( new std::ofstream ( filename.c_str() ) )
, m_own ( true )
, m_buffer ( 0 )
, m_keep ( 0 )
, m_buffer ( nullptr )
, m_keep ( std::cout.rdbuf() )
{
m_keep = std::cout.rdbuf() ;
m_buffer.reset ( new std::teebuf ( m_keep , m_file->rdbuf() ) ) ;
std::cout.rdbuf ( m_buffer.get() ) ;
}
......@@ -144,10 +138,9 @@ Gaudi::Utils::Tee::Tee ( const std::string& filename )
Gaudi::Utils::Tee::Tee ( std::ostream& filestream )
: m_file ( &filestream )
, m_own ( false )
, m_buffer ( 0 )
, m_keep ( 0 )
, m_buffer ( nullptr )
, m_keep ( std::cout.rdbuf() )
{
m_keep = std::cout.rdbuf() ;
m_buffer.reset ( new std::teebuf ( m_keep , m_file->rdbuf() ) ) ;
std::cout.rdbuf ( m_buffer.get() ) ;
}
......
###############################################################################
# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration #
# (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
......@@ -8,9 +8,8 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
################################################################################
# Package: JetAccessoriesMC
################################################################################
###############################################################################
gaudi_subdir(JetAccessoriesMC)
gaudi_depends_on_subdirs(Kernel/LHCbMath
......@@ -21,10 +20,10 @@ gaudi_depends_on_subdirs(Kernel/LHCbMath
Phys/LoKiPhysMC)
find_package(FastJet)
find_package(Boost)
find_package(ROOT)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
${FASTJET_INCLUDE_DIRS})
gaudi_add_module(JetAccessoriesMC
src/*.cpp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment