Skip to content

Commit 16689f9

Browse files
committed
Merge pull request cms-sw#2673 from degano/unused_warnings_fix_71X_gcc490
GCC 4.9.0 -- Fix unused function warnings.
2 parents cabe5cd + 32b561b commit 16689f9

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

CommonTools/Clustering1D/test/ClusteringTest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace
7373
cout << endl;
7474
}
7575

76-
void run ( const vector < Cluster1D<string> > & input )
76+
inline void run ( const vector < Cluster1D<string> > & input )
7777
{
7878
cout << endl << "Input: " << endl;
7979
print ( input );

CommonTools/Clustering1D/test/Input.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using namespace std;
1212

1313
namespace
1414
{
15-
Cluster1D<string> createCluster ( float pos, float err, float weight, string name )
15+
inline Cluster1D<string> createCluster ( float pos, float err, float weight, string name )
1616
{
1717
vector < const string * > names;
1818
names.push_back ( new string(name) );
@@ -39,7 +39,7 @@ Cluster1D<string> createCluster ( float pos, float err, float weight )
3939
return ret;
4040
}
4141

42-
void deleteCluster ( vector < Cluster1D<string> > & clus )
42+
inline void deleteCluster ( vector < Cluster1D<string> > & clus )
4343
{
4444
cout << "[Deleting Sequence] ..." << flush;
4545
for ( vector< Cluster1D<string> >::const_iterator i=clus.begin();
@@ -106,7 +106,7 @@ vector < Cluster1D<string> > fourItems()
106106
* In this function the user gives the name of
107107
* the "secnario"
108108
*/
109-
vector < Cluster1D<string> > createInput( string name )
109+
inline vector < Cluster1D<string> > createInput( string name )
110110
{
111111
// that's a map that maps the function to ordinary names.
112112
map < string, vector < Cluster1D<string> > (*)() > inputs;
@@ -133,7 +133,7 @@ vector < Cluster1D<string> > createInput( string name )
133133
/**
134134
* The user gives the number of clusters
135135
*/
136-
vector < Cluster1D<string> > createInput ( int n )
136+
inline vector < Cluster1D<string> > createInput ( int n )
137137
{
138138
vector < Cluster1D<string> > ret;
139139
for ( int i=0; i< n ; ++i )

CondCore/ORA/test/test_Record.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "cxxabi.h"
1414

1515
namespace {
16-
void printMem(char const * title) {
16+
inline void printMem(char const * title) {
1717
std::cout << "\n--- " << title <<" ---"<< std::endl;
1818
#ifdef __APPLE__
1919
std::cout << "not supported" << std::endl;

DataFormats/TrackerRecHit2D/src/BaseTrackerRecHit.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace {
88
void
9-
throwExceptionUninitialized(const char *where)
9+
inline throwExceptionUninitialized(const char *where)
1010
{
1111
throw cms::Exception("BaseTrackerRecHit") <<
1212
"Trying to access " << where << " for a RecHit that was read from disk, but since CMSSW_2_1_X local positions are transient.\n" <<

DataFormats/TrackerRecHit2D/src/TrackerSingleRecHit.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ namespace {
8989
}
9090

9191
bool doingCheck = false;
92-
void checkSelf(const TrackingRecHit* one,const TrackingRecHit* two) {
92+
inline void checkSelf(const TrackingRecHit* one,const TrackingRecHit* two) {
9393
doingCheck=true;
9494
if (!one->sharesInput(one,TrackingRecHit::all)) problem(one,"all");
9595
if (!one->sharesInput(one,TrackingRecHit::some)) problem(one,"some");

GeneratorInterface/GenFilters/src/PythiaFilterEMJet.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ using namespace std;
1111

1212
namespace{
1313

14-
double deltaR2(double eta0, double phi0, double eta, double phi){
14+
inline double deltaR2(double eta0, double phi0, double eta, double phi){
1515
double dphi=phi-phi0;
1616
if(dphi>M_PI) dphi-=2*M_PI;
1717
else if(dphi<=-M_PI) dphi+=2*M_PI;

RecoEcal/EgammaClusterAlgos/src/PFECALSuperClusterAlgo.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace {
3838
return a.first < b.first;
3939
}
4040

41-
double getPFClusterEnergy(const PFClusterPtr& p) {
41+
inline double getPFClusterEnergy(const PFClusterPtr& p) {
4242
return p->energy();
4343
}
4444

0 commit comments

Comments
 (0)