Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/IntegerConversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@
#include <iostream>
#include <string>

// Prevents the compiler from generating several copies of
// methods during the precompiling stage, which leads to longer
// compile time.

#if defined(__GNUC__)
#pragma interface
#endif

template <class Integer> class IntegerConversion {

public:
Expand Down Expand Up @@ -51,10 +43,6 @@ template <class Integer> class UnsignedIntegerConversion {
Integer rec_strtoi(const AIDA_STD::string &s);
};

#if defined(__GNUC__)
#pragma implementation
#endif

template <class Integer> AIDA_STD::string IntegerConversion<Integer>:: itostr(Integer n) {

AIDA_STD::string retval;
Expand Down
4 changes: 2 additions & 2 deletions src/MySqlDBMgr.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 1999-2003 FreeDevices.org geral@freedevices.org
Copyright (C) 1999-2003, 2025 FreeDevices.org geral@freedevices.org

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -152,7 +152,7 @@ void MySqlDBMgr::init(string& databaseInfo)

DebugMesg(CondDB, user, "databaseInfo = " << databaseInfo);

unsigned int sep = databaseInfo.find_first_of(":");
std::string::size_type sep = databaseInfo.find_first_of(":");
int end = databaseInfo.size();
serverName = databaseInfo.substr(0, sep);
databaseInfo = databaseInfo.substr(sep + 1, end);
Expand Down
6 changes: 3 additions & 3 deletions src/MySqlDBMgr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 1999-2003 FreeDevices.org geral@freedevices.org
Copyright (C) 1999-2003, 2025 FreeDevices.org geral@freedevices.org

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -61,9 +61,9 @@ class MySqlDBMgr : public MySqlConnection {
void startRead();

// Get the time maintained by the DBMS, which should be used for timestamps
string getDBName() { return databaseName; }
const string& getDBName() { return databaseName; }

string getSrvName() { return serverName; }
const string& getSrvName() { return serverName; }

// The connect() method which establishes the DBMS connection
// Defined in the superclass
Expand Down
4 changes: 2 additions & 2 deletions src/MySqlOnlineMgr.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright (C) 1999-2003 FreeDevices.org geral@freedevices.org
Copyright (C) 1999-2003, 2025 FreeDevices.org geral@freedevices.org

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -1097,7 +1097,7 @@ void MySqlOnlineMgr::getSchema(int fldId, int partId, CondDBTable *table, bool v
string fname = res->getField(0);
string type = res->getField(1);
string name;
CondDBTable::cdb_types colType;
CondDBTable::cdb_types colType = CondDBTable::cdbNull;
if (type!="blob")
{
if (type=="float") colType=CondDBTable::cdbFloat;
Expand Down
6 changes: 3 additions & 3 deletions src/SimpleTimeDuration.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void SimpleTimeDuration::operator *= (const double & factor) {
}
if (isPlusInf()) { // Leave unchanged if infinity
return;
} else if (SIMPLEDURATION_MAX/factor < (double)durationval) { // Overflow!
} else if (static_cast<double>(SIMPLEDURATION_MAX)/factor < (double)durationval) { // Overflow!
setPlusInf();
} else { // Normal case
durationval = (DurationT) ceil(durationval*factor);
Expand All @@ -155,7 +155,7 @@ void SimpleTimeDuration::operator /= (const double & denom) {
}
if (isPlusInf()) { // Leave unchanged if infinity
return;
} else if ((denom < 1) && (durationval > denom*SIMPLEDURATION_MAX)) {
} else if ((denom < 1) && (durationval > denom*static_cast<double>(SIMPLEDURATION_MAX))) {
setPlusInf(); // Overflow! TODO: Throw an exception
} else {
durationval = (DurationT) ceil(durationval/denom);
Expand Down Expand Up @@ -183,7 +183,7 @@ SimpleTimeDuration operator / (const SimpleTimeDuration & d,
double operator / (const SimpleTimeDuration & d,
const SimpleTimeDuration & denom) {
if (d.isPlusInf()) {
return SIMPLEDURATION_MAX;
return static_cast<double>(SIMPLEDURATION_MAX);
} else if (denom.isPlusInf()) {
return .0;
} else {
Expand Down