Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CommonTools] Move public headers in to interface directory #34893

Merged
merged 1 commit into from
Aug 17, 2021
Merged

[CommonTools] Move public headers in to interface directory #34893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 ...onTools/RecoAlgos/src/CandidateProducer.h → ...s/RecoAlgos/interface/CandidateProducer.h
View file
Open in desktop
File renamed without changes.
0 ...RecoAlgos/src/MassiveCandidateConverter.h → ...gos/interface/MassiveCandidateConverter.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions CommonTools/RecoAlgos/interface/TrackToRefCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef RecoAlgos_TrackToRefCandidate_h
#define RecoAlgos_TrackToRefCandidate_h
#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidate.h"
#include "DataFormats/RecoCandidate/interface/RecoChargedRefCandidateFwd.h"
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/RecoAlgos/plugins/RecoChargedRefCandidateToTrackRefProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "CommonTools/RecoAlgos/src/RecoChargedRefCandidateToTrackRef.h"
#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"

#include "FWCore/Framework/interface/MakerMacros.h"

Expand Down
2 changes: 1 addition & 1 deletion CommonTools/RecoAlgos/src/MassiveCandidateConverter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "HepPDT/ParticleData.hh"
#include "FWCore/Framework/interface/ESHandle.h"
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/RecoAlgos/src/PFClusterToRefCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef RecoAlgos_PFClusterToRefCandidate_h
#define RecoAlgos_PFClusterToRefCandidate_h
#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
#include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidate.h"
#include "DataFormats/ParticleFlowReco/interface/RecoPFClusterRefCandidateFwd.h"
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/RecoAlgos/src/StandAloneMuonTrackToCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef RecoAlgos_StandAloneMuonTrackToCandidate_h
#define RecoAlgos_StandAloneMuonTrackToCandidate_h
#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/RecoCandidate/interface/RecoStandAloneMuonCandidate.h"
#include "DataFormats/RecoCandidate/interface/RecoStandAloneMuonCandidateFwd.h"
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/RecoAlgos/src/SuperClusterToCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef RecoAlgos_SuperClusterToCandidate_h
#define RecoAlgos_SuperClusterToCandidate_h
#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
#include "DataFormats/EgammaReco/interface/SuperCluster.h"
#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
#include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h"
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/RecoAlgos/src/TrackToCandidate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef RecoAlgos_TrackToCandidate_h
#define RecoAlgos_TrackToCandidate_h
#include "CommonTools/RecoAlgos/src/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/src/CandidateProducer.h"
#include "CommonTools/RecoAlgos/interface/MassiveCandidateConverter.h"
#include "CommonTools/RecoAlgos/interface/CandidateProducer.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"
Expand Down
0 CommonTools/Utils/src/AnyMethodArgument.h → ...Tools/Utils/interface/AnyMethodArgument.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/BinaryCutSetter.h → ...onTools/Utils/interface/BinaryCutSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/SelectorStack.h"
#include "CommonTools/Utils/src/LogicalBinaryOperator.h"
#include "CommonTools/Utils/interface/SelectorStack.h"
#include "CommonTools/Utils/interface/LogicalBinaryOperator.h"

namespace reco {
namespace parser {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/BinarySelector.h → CommonTools/Utils/interface/BinarySelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
#include "CommonTools/Utils/interface/SelectorBase.h"
#include "CommonTools/Utils/interface/ExpressionBase.h"
#include "CommonTools/Utils/src/ComparisonBase.h"
#include "CommonTools/Utils/interface/ComparisonBase.h"

namespace reco {
namespace parser {
Expand Down
8 changes: 4 additions & 4 deletions CommonTools/Utils/src/BinarySelectorSetter.h → ...ls/Utils/interface/BinarySelectorSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/SelectorStack.h"
#include "CommonTools/Utils/src/ComparisonStack.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/src/BinarySelector.h"
#include "CommonTools/Utils/interface/SelectorStack.h"
#include "CommonTools/Utils/interface/ComparisonStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"
#include "CommonTools/Utils/interface/BinarySelector.h"
#include "CommonTools/Utils/interface/Exception.h"

namespace reco {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/Comparison.h → CommonTools/Utils/interface/Comparison.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/ComparisonBase.h"
#include "CommonTools/Utils/interface/ComparisonBase.h"

namespace reco {
namespace parser {
Expand Down
0 CommonTools/Utils/src/ComparisonBase.h → CommonTools/Utils/interface/ComparisonBase.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/ComparisonSetter.h → ...nTools/Utils/interface/ComparisonSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/ComparisonStack.h"
#include "CommonTools/Utils/src/Comparison.h"
#include "CommonTools/Utils/interface/ComparisonStack.h"
#include "CommonTools/Utils/interface/Comparison.h"
#ifdef BOOST_SPIRIT_DEBUG
#include <iostream>
#include <string>
Expand Down
0 CommonTools/Utils/src/ComparisonStack.h → ...onTools/Utils/interface/ComparisonStack.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/CutSetter.h → CommonTools/Utils/interface/CutSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/
#include "CommonTools/Utils/interface/SelectorPtr.h"
#include "CommonTools/Utils/src/SelectorStack.h"
#include "CommonTools/Utils/interface/SelectorStack.h"
#include <cassert>

namespace reco {
Expand Down
2 changes: 1 addition & 1 deletion ...ools/Utils/src/ExpressionBinaryOperator.h → ...tils/interface/ExpressionBinaryOperator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/
#include "CommonTools/Utils/interface/ExpressionBase.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"

namespace reco {
namespace parser {
Expand Down
4 changes: 2 additions & 2 deletions ...tils/src/ExpressionBinaryOperatorSetter.h → ...nterface/ExpressionBinaryOperatorSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/ExpressionBinaryOperator.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/interface/ExpressionBinaryOperator.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"
#include <cmath>

namespace reco {
Expand Down
4 changes: 2 additions & 2 deletions ...ols/Utils/src/ExpressionConditionSetter.h → ...ils/interface/ExpressionConditionSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* \version $Revision: 1.1 $
*
*/
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/src/SelectorStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"
#include "CommonTools/Utils/interface/SelectorStack.h"

namespace reco {
namespace parser {
Expand Down
4 changes: 2 additions & 2 deletions ...ools/Utils/src/ExpressionFunctionSetter.h → ...tils/interface/ExpressionFunctionSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* \version $Revision: 1.1 $
*
*/
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/src/FunctionStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"
#include "CommonTools/Utils/interface/FunctionStack.h"

namespace reco {
namespace parser {
Expand Down
0 CommonTools/Utils/src/ExpressionNumber.h → ...nTools/Utils/interface/ExpressionNumber.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...nTools/Utils/src/ExpressionNumberSetter.h → .../Utils/interface/ExpressionNumberSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
* \version $Revision: 1.3 $
*
*/
#include "CommonTools/Utils/src/ExpressionNumber.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/interface/ExpressionNumber.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"

namespace reco {
namespace parser {
Expand Down
10 changes: 5 additions & 5 deletions ...ools/Utils/src/ExpressionSelectorSetter.h → ...tils/interface/ExpressionSelectorSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/SelectorStack.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/src/BinarySelector.h"
#include "CommonTools/Utils/src/ExpressionNumber.h"
#include "CommonTools/Utils/src/Comparison.h"
#include "CommonTools/Utils/interface/SelectorStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"
#include "CommonTools/Utils/interface/BinarySelector.h"
#include "CommonTools/Utils/interface/ExpressionNumber.h"
#include "CommonTools/Utils/interface/Comparison.h"
#include "CommonTools/Utils/interface/Exception.h"

#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/ExpressionSetter.h → ...nTools/Utils/interface/ExpressionSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/
#include "CommonTools/Utils/interface/ExpressionPtr.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"

namespace reco {
namespace parser {
Expand Down
0 CommonTools/Utils/src/ExpressionStack.h → ...onTools/Utils/interface/ExpressionStack.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Tools/Utils/src/ExpressionUnaryOperator.h → ...Utils/interface/ExpressionUnaryOperator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/
#include "CommonTools/Utils/interface/ExpressionBase.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"

namespace reco {
namespace parser {
Expand Down
4 changes: 2 additions & 2 deletions ...Utils/src/ExpressionUnaryOperatorSetter.h → ...interface/ExpressionUnaryOperatorSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/ExpressionUnaryOperator.h"
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/interface/ExpressionUnaryOperator.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"
#ifdef BOOST_SPIRIT_DEBUG
#include <string>
#include <iostream>
Expand Down
6 changes: 3 additions & 3 deletions CommonTools/Utils/src/ExpressionVarSetter.h → ...ols/Utils/interface/ExpressionVarSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
* \version $Revision: 1.3 $
*
*/
#include "CommonTools/Utils/src/ExpressionStack.h"
#include "CommonTools/Utils/src/MethodStack.h"
#include "CommonTools/Utils/src/TypeStack.h"
#include "CommonTools/Utils/interface/ExpressionStack.h"
#include "CommonTools/Utils/interface/MethodStack.h"
#include "CommonTools/Utils/interface/TypeStack.h"

namespace reco {
namespace parser {
Expand Down
0 CommonTools/Utils/src/Function.h → CommonTools/Utils/interface/Function.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/FunctionSetter.h → CommonTools/Utils/interface/FunctionSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* \version $Revision: 1.2 $
*
*/
#include "CommonTools/Utils/src/Function.h"
#include "CommonTools/Utils/src/FunctionStack.h"
#include "CommonTools/Utils/interface/Function.h"
#include "CommonTools/Utils/interface/FunctionStack.h"

namespace reco {
namespace parser {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/FunctionStack.h → CommonTools/Utils/interface/FunctionStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* \version $Revision: 1.1 $
*
*/
#include "CommonTools/Utils/src/Function.h"
#include "CommonTools/Utils/interface/Function.h"
#include <vector>

namespace reco {
Expand Down
45 changes: 22 additions & 23 deletions CommonTools/Utils/interface/Grammar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,30 @@
#include "boost/spirit/include/classic_grammar_def.hpp"
#include "boost/spirit/include/classic_chset.hpp"
#include <functional>
#include "CommonTools/Utils/src/ExpressionNumberSetter.h"
#include "CommonTools/Utils/src/ExpressionVarSetter.h"
#include "CommonTools/Utils/src/ExpressionFunctionSetter.h"
#include "CommonTools/Utils/src/ExpressionConditionSetter.h"
#include "CommonTools/Utils/src/ComparisonSetter.h"
#include "CommonTools/Utils/src/BinarySelectorSetter.h"
#include "CommonTools/Utils/src/TrinarySelectorSetter.h"
#include "CommonTools/Utils/src/IntSetter.h"
#include "CommonTools/Utils/src/MethodStack.h"
#include "CommonTools/Utils/src/MethodArgumentStack.h"
#include "CommonTools/Utils/src/TypeStack.h"
#include "CommonTools/Utils/src/IntStack.h"
#include "CommonTools/Utils/src/FunctionSetter.h"
#include "CommonTools/Utils/src/CutSetter.h"
#include "CommonTools/Utils/src/BinaryCutSetter.h"
#include "CommonTools/Utils/src/UnaryCutSetter.h"
#include "CommonTools/Utils/src/ExpressionSetter.h"
#include "CommonTools/Utils/src/ExpressionBinaryOperatorSetter.h"
#include "CommonTools/Utils/src/ExpressionUnaryOperatorSetter.h"
#include "CommonTools/Utils/src/ExpressionSelectorSetter.h"
#include "CommonTools/Utils/src/MethodSetter.h"
#include "CommonTools/Utils/src/MethodArgumentSetter.h"
#include "CommonTools/Utils/interface/ExpressionNumberSetter.h"
#include "CommonTools/Utils/interface/ExpressionVarSetter.h"
#include "CommonTools/Utils/interface/ExpressionFunctionSetter.h"
#include "CommonTools/Utils/interface/ExpressionConditionSetter.h"
#include "CommonTools/Utils/interface/ComparisonSetter.h"
#include "CommonTools/Utils/interface/BinarySelectorSetter.h"
#include "CommonTools/Utils/interface/TrinarySelectorSetter.h"
#include "CommonTools/Utils/interface/IntSetter.h"
#include "CommonTools/Utils/interface/MethodStack.h"
#include "CommonTools/Utils/interface/MethodArgumentStack.h"
#include "CommonTools/Utils/interface/TypeStack.h"
#include "CommonTools/Utils/interface/IntStack.h"
#include "CommonTools/Utils/interface/FunctionSetter.h"
#include "CommonTools/Utils/interface/CutSetter.h"
#include "CommonTools/Utils/interface/BinaryCutSetter.h"
#include "CommonTools/Utils/interface/UnaryCutSetter.h"
#include "CommonTools/Utils/interface/ExpressionSetter.h"
#include "CommonTools/Utils/interface/ExpressionBinaryOperatorSetter.h"
#include "CommonTools/Utils/interface/ExpressionUnaryOperatorSetter.h"
#include "CommonTools/Utils/interface/ExpressionSelectorSetter.h"
#include "CommonTools/Utils/interface/MethodSetter.h"
#include "CommonTools/Utils/interface/MethodArgumentSetter.h"
#include "CommonTools/Utils/interface/Exception.h"
#include "FWCore/Reflection/interface/TypeWithDict.h"
// #include "CommonTools/Utils/src/Abort.h"

namespace reco {
namespace parser {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/IntSetter.h → CommonTools/Utils/interface/IntSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* \version $Revision: 1.1 $
*
*/
#include "CommonTools/Utils/src/IntStack.h"
#include "CommonTools/Utils/interface/IntStack.h"

namespace reco {
namespace parser {
Expand Down
0 CommonTools/Utils/src/IntStack.h → CommonTools/Utils/interface/IntStack.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...onTools/Utils/src/LogicalBinaryOperator.h → ...s/Utils/interface/LogicalBinaryOperator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/
#include "CommonTools/Utils/interface/SelectorBase.h"
#include "CommonTools/Utils/src/SelectorStack.h"
#include "CommonTools/Utils/interface/SelectorStack.h"

namespace reco {
namespace parser {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/LogicalUnaryOperator.h → ...ls/Utils/interface/LogicalUnaryOperator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/
#include "CommonTools/Utils/interface/SelectorBase.h"
#include "CommonTools/Utils/src/SelectorStack.h"
#include "CommonTools/Utils/interface/SelectorStack.h"

namespace reco {
namespace parser {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/MethodArgumentSetter.h → ...ls/Utils/interface/MethodArgumentSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* \version $Revision: 1.1 $
*
*/
#include "CommonTools/Utils/src/MethodArgumentStack.h"
#include "CommonTools/Utils/interface/MethodArgumentStack.h"
#include <cassert>

namespace reco {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/MethodArgumentStack.h → ...ols/Utils/interface/MethodArgumentStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
*/

#include "CommonTools/Utils/src/MethodInvoker.h"
#include "CommonTools/Utils/interface/MethodInvoker.h"
#include <vector>

namespace reco {
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/Utils/src/MethodInvoker.h → CommonTools/Utils/interface/MethodInvoker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef CommonTools_Utils_MethodInvoker_h
#define CommonTools_Utils_MethodInvoker_h

#include "CommonTools/Utils/src/AnyMethodArgument.h"
#include "CommonTools/Utils/src/TypeCode.h"
#include "CommonTools/Utils/interface/AnyMethodArgument.h"
#include "CommonTools/Utils/interface/TypeCode.h"
#include "FWCore/Reflection/interface/FunctionWithDict.h"
#include "FWCore/Reflection/interface/MemberWithDict.h"
#include "FWCore/Reflection/interface/ObjectWithDict.h"
Expand Down
6 changes: 3 additions & 3 deletions CommonTools/Utils/src/MethodSetter.h → CommonTools/Utils/interface/MethodSetter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
*/

#include "CommonTools/Utils/src/MethodStack.h"
#include "CommonTools/Utils/src/TypeStack.h"
#include "CommonTools/Utils/src/MethodArgumentStack.h"
#include "CommonTools/Utils/interface/MethodStack.h"
#include "CommonTools/Utils/interface/TypeStack.h"
#include "CommonTools/Utils/interface/MethodArgumentStack.h"

namespace reco {
namespace parser {
Expand Down
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/MethodStack.h → CommonTools/Utils/interface/MethodStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
*/

#include "CommonTools/Utils/src/MethodInvoker.h"
#include "CommonTools/Utils/interface/MethodInvoker.h"
#include <vector>

namespace reco {
Expand Down
0 CommonTools/Utils/src/SelectorStack.h → CommonTools/Utils/interface/SelectorStack.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion CommonTools/Utils/src/TrinarySelector.h → ...onTools/Utils/interface/TrinarySelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
#include "CommonTools/Utils/interface/SelectorBase.h"
#include "CommonTools/Utils/interface/ExpressionBase.h"
#include "CommonTools/Utils/src/ComparisonBase.h"
#include "CommonTools/Utils/interface/ComparisonBase.h"

namespace reco {
namespace parser {
Expand Down