Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Analysis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LHCb
Analysis
Commits
7fab5188
Commit
7fab5188
authored
5 years ago
by
Marco Cattaneo
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation warnings
parent
70c3fe4c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!579
Fix compilation warnings
Pipeline
#1374222
passed
5 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Phys/AnalysisPython/Analysis/Tee.h
+5
-7
5 additions, 7 deletions
Phys/AnalysisPython/Analysis/Tee.h
Phys/AnalysisPython/src/Tee.cpp
+5
-12
5 additions, 12 deletions
Phys/AnalysisPython/src/Tee.cpp
Phys/JetAccessoriesMC/CMakeLists.txt
+4
-5
4 additions, 5 deletions
Phys/JetAccessoriesMC/CMakeLists.txt
with
14 additions
and
24 deletions
Phys/AnalysisPython/Analysis/Tee.h
+
5
−
7
View file @
7fab5188
/*****************************************************************************\
* (c) Copyright 2000-20
19
CERN for the benefit of the LHCb Collaboration *
* (c) Copyright 2000-20
20
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
// ======================================================================
};
// ========================================================================
...
...
This diff is collapsed.
Click to expand it.
Phys/AnalysisPython/src/Tee.cpp
+
5
−
12
View file @
7fab5188
/*****************************************************************************\
* (c) Copyright 2000-20
19
CERN for the benefit of the LHCb Collaboration *
* (c) Copyright 2000-20
20
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
()
)
;
}
...
...
This diff is collapsed.
Click to expand it.
Phys/JetAccessoriesMC/CMakeLists.txt
+
4
−
5
View file @
7fab5188
###############################################################################
# (c) Copyright 2000-20
19
CERN for the benefit of the LHCb Collaboration #
# (c) Copyright 2000-20
20
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment