PentHertz
/
CommonLibs
mirror of https://github.com/PentHertz/CommonLibs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminate more "using namespace" statements.

This commit is contained in:
dgotwisner 2014-03-31 10:31:29 +02:00 committed by Michael Iedema
parent b8ca812fde
commit 66a47d9bff
5 changed files with 50 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BitVector.cpp
View File

@ -32,8 +32,6 @@
#include <sstream> #include <sstream>
#include <string.h> #include <string.h>
using namespace std;
BitVector::BitVector(const char *valString) BitVector::BitVector(const char *valString)
@ -238,7 +236,7 @@ void BitVector::unmap(const unsigned *map, size_t mapSize, BitVector& dest) cons
ostream& operator<<(ostream& os, const BitVector& hv) std::ostream& operator<<(std::ostream& os, const BitVector& hv)
{ {
for (size_t i=0; i<hv.size(); i++) { for (size_t i=0; i<hv.size(); i++) {
if (hv.bit(i)) os << '1'; if (hv.bit(i)) os << '1';
@ -341,7 +339,7 @@ float SoftVector::getSNR() const
} }
ostream& operator<<(ostream& os, const SoftVector& sv) std::ostream& operator<<(std::ostream& os, const SoftVector& sv)
{ {
for (size_t i=0; i<sv.size(); i++) { for (size_t i=0; i<sv.size(); i++) {
if (sv[i]<0.25) os << "0"; if (sv[i]<0.25) os << "0";
@ -380,7 +378,7 @@ void BitVector::unpack(const unsigned char* src)
fillField(whole,src[bytes] >> (8-rem),rem); fillField(whole,src[bytes] >> (8-rem),rem);
} }
void BitVector::hex(ostream& os) const void BitVector::hex(std::ostream& os) const
{ {
os << std::hex; os << std::hex;
unsigned digits = size()/4; unsigned digits = size()/4;

86
Configuration.cpp
View File

@ -39,8 +39,6 @@
#define debugLogEarly(...) #define debugLogEarly(...)
#endif #endif
using namespace std;
char gCmdName[20] = {0}; // Use a char* to avoid avoid static initialization of string, and race at startup. char gCmdName[20] = {0}; // Use a char* to avoid avoid static initialization of string, and race at startup.
static const char* createConfigTable = { static const char* createConfigTable = {
@ -216,17 +214,17 @@ string ConfigurationTable::getDefaultSQL(const std::string& program, const std::
stringstream ss; stringstream ss;
ConfigurationKeyMap::iterator mp; ConfigurationKeyMap::iterator mp;
ss << "--" << endl; ss << "--" << std::endl;
ss << "-- This file was generated using: " << program << " --gensql" << endl; ss << "-- This file was generated using: " << program << " --gensql" << std::endl;
ss << "-- binary version: " << version << endl; ss << "-- binary version: " << version << std::endl;
ss << "--" << endl; ss << "--" << std::endl;
ss << "-- Future changes should not be put in this file directly but" << endl; ss << "-- Future changes should not be put in this file directly but" << std::endl;
ss << "-- rather in the program's ConfigurationKey schema." << endl; ss << "-- rather in the program's ConfigurationKey schema." << std::endl;
ss << "--" << endl; ss << "--" << std::endl;
ss << "PRAGMA foreign_keys=OFF;" << endl; ss << "PRAGMA foreign_keys=OFF;" << std::endl;
//ss << "PRAGMA journal_mode=WAL;" << endl; //ss << "PRAGMA journal_mode=WAL;" << std::endl;
ss << "BEGIN TRANSACTION;" << endl; ss << "BEGIN TRANSACTION;" << std::endl;
ss << "CREATE TABLE IF NOT EXISTS CONFIG ( KEYSTRING TEXT UNIQUE NOT NULL, VALUESTRING TEXT, STATIC INTEGER DEFAULT 0, OPTIONAL INTEGER DEFAULT 0, COMMENTS TEXT DEFAULT '');" << endl; ss << "CREATE TABLE IF NOT EXISTS CONFIG ( KEYSTRING TEXT UNIQUE NOT NULL, VALUESTRING TEXT, STATIC INTEGER DEFAULT 0, OPTIONAL INTEGER DEFAULT 0, COMMENTS TEXT DEFAULT '');" << std::endl;
mp = mSchema.begin(); mp = mSchema.begin();
while (mp != mSchema.end()) { while (mp != mSchema.end()) {
@ -258,12 +256,12 @@ string ConfigurationTable::getDefaultSQL(const std::string& program, const std::
ss << " Static."; ss << " Static.";
} }
ss << quote; ss << quote;
ss << ");" << endl; ss << ");" << std::endl;
mp++; mp++;
} }
ss << "COMMIT;" << endl; ss << "COMMIT;" << std::endl;
ss << endl; ss << std::endl;
return ss.str(); return ss.str();
} }
@ -273,13 +271,13 @@ string ConfigurationTable::getTeX(const std::string& program, const std::string&
stringstream ss; stringstream ss;
ConfigurationKeyMap::iterator mp; ConfigurationKeyMap::iterator mp;
ss << "% START AUTO-GENERATED CONTENT" << endl; ss << "% START AUTO-GENERATED CONTENT" << std::endl;
ss << "% -- these sections were generated using: " << program << " --gentex" << endl; ss << "% -- these sections were generated using: " << program << " --gentex" << std::endl;
ss << "% -- binary version: " << version << endl; ss << "% -- binary version: " << version << std::endl;
ss << "\\section{Customer Site Parameters}" << endl; ss << "\\section{Customer Site Parameters}" << std::endl;
ss << "These parameters must be changed to fit your site." << endl; ss << "These parameters must be changed to fit your site." << std::endl;
ss << "\\begin{itemize}" << endl; ss << "\\begin{itemize}" << std::endl;
mp = mSchema.begin(); mp = mSchema.begin();
while (mp != mSchema.end()) { while (mp != mSchema.end()) {
if (mp->second.getVisibility() == ConfigurationKey::CUSTOMERSITE) { if (mp->second.getVisibility() == ConfigurationKey::CUSTOMERSITE) {
@ -288,16 +286,16 @@ string ConfigurationTable::getTeX(const std::string& program, const std::string&
ss << mp->first << "} -- "; ss << mp->first << "} -- ";
// description // description
ss << mp->second.getDescription(); ss << mp->second.getDescription();
ss << endl; ss << std::endl;
} }
mp++; mp++;
} }
ss << "\\end{itemize}" << endl; ss << "\\end{itemize}" << std::endl;
ss << endl; ss << std::endl;
ss << "\\section{Customer Tuneable Parameters}" << endl; ss << "\\section{Customer Tuneable Parameters}" << std::endl;
ss << "These parameters can be changed to optimize your site." << endl; ss << "These parameters can be changed to optimize your site." << std::endl;
ss << "\\begin{itemize}" << endl; ss << "\\begin{itemize}" << std::endl;
mp = mSchema.begin(); mp = mSchema.begin();
while (mp != mSchema.end()) { while (mp != mSchema.end()) {
if (mp->second.getVisibility() != ConfigurationKey::CUSTOMERSITE && if (mp->second.getVisibility() != ConfigurationKey::CUSTOMERSITE &&
@ -311,16 +309,16 @@ string ConfigurationTable::getTeX(const std::string& program, const std::string&
ss << mp->first << "} -- "; ss << mp->first << "} -- ";
// description // description
ss << mp->second.getDescription(); ss << mp->second.getDescription();
ss << endl; ss << std::endl;
} }
mp++; mp++;
} }
ss << "\\end{itemize}" << endl; ss << "\\end{itemize}" << std::endl;
ss << endl; ss << std::endl;
ss << "\\section{Developer/Factory Parameters}" << endl; ss << "\\section{Developer/Factory Parameters}" << std::endl;
ss << "These parameters should only be changed by when developing new code." << endl; ss << "These parameters should only be changed by when developing new code." << std::endl;
ss << "\\begin{itemize}" << endl; ss << "\\begin{itemize}" << std::endl;
mp = mSchema.begin(); mp = mSchema.begin();
while (mp != mSchema.end()) { while (mp != mSchema.end()) {
if (mp->second.getVisibility() == ConfigurationKey::FACTORY || if (mp->second.getVisibility() == ConfigurationKey::FACTORY ||
@ -330,13 +328,13 @@ string ConfigurationTable::getTeX(const std::string& program, const std::string&
ss << mp->first << "} -- "; ss << mp->first << "} -- ";
// description // description
ss << mp->second.getDescription(); ss << mp->second.getDescription();
ss << endl; ss << std::endl;
} }
mp++; mp++;
} }
ss << "\\end{itemize}" << endl; ss << "\\end{itemize}" << std::endl;
ss << "% END AUTO-GENERATED CONTENT" << endl; ss << "% END AUTO-GENERATED CONTENT" << std::endl;
ss << endl; ss << std::endl;
string tmp = Utils::replaceAll(ss.str(), "^", "\\^"); string tmp = Utils::replaceAll(ss.str(), "^", "\\^");
return Utils::replaceAll(tmp, "_", "\\_"); return Utils::replaceAll(tmp, "_", "\\_");
@ -821,7 +819,7 @@ bool ConfigurationTable::remove(const string& key)
void ConfigurationTable::find(const string& pat, ostream& os) const void ConfigurationTable::find(const string& pat, std::ostream& os) const
{ {
// Prepare the statement. // Prepare the statement.
string cmd = "SELECT KEYSTRING,VALUESTRING FROM CONFIG WHERE KEYSTRING LIKE \"%" + pat + "%\""; string cmd = "SELECT KEYSTRING,VALUESTRING FROM CONFIG WHERE KEYSTRING LIKE \"%" + pat + "%\"";
@ -836,8 +834,8 @@ void ConfigurationTable::find(const string& pat, ostream& os) const
if (value) { if (value) {
len = strlen(value); len = strlen(value);
} }
if (len && value) os << value << endl; if (len && value) os << value << std::endl;
else os << "(disabled)" << endl; else os << "(disabled)" << std::endl;
src = sqlite3_run_query(mDB,stmt); src = sqlite3_run_query(mDB,stmt);
} }
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
@ -1154,7 +1152,7 @@ const std::string ConfigurationKey::typeToString(const ConfigurationKey::Type& t
return ret; return ret;
} }
void ConfigurationKey::printKey(const ConfigurationKey &key, const std::string& currentValue, ostream& os) { void ConfigurationKey::printKey(const ConfigurationKey &key, const std::string& currentValue, std::ostream& os) {
os << key.getName() << " "; os << key.getName() << " ";
if (!currentValue.length()) { if (!currentValue.length()) {
os << "(disabled)"; os << "(disabled)";
@ -1164,10 +1162,10 @@ void ConfigurationKey::printKey(const ConfigurationKey &key, const std::string&
if (currentValue.compare(key.getDefaultValue()) == 0) { if (currentValue.compare(key.getDefaultValue()) == 0) {
os << " [default]"; os << " [default]";
} }
os << endl; os << std::endl;
} }
void ConfigurationKey::printDescription(const ConfigurationKey &key, ostream& os) { void ConfigurationKey::printDescription(const ConfigurationKey &key, std::ostream& os) {
std::string tmp; std::string tmp;
unsigned scope; unsigned scope;

10
F16Test.cpp
View File

@ -28,8 +28,6 @@
#include <iostream> #include <iostream>
using namespace std;
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
@ -38,18 +36,18 @@ int main(int argc, char **argv)
F16 c = 2.5 * 1.5; F16 c = 2.5 * 1.5;
F16 d = c + a; F16 d = c + a;
F16 e = 10; F16 e = 10;
cout << a << ' ' << b << ' ' << c << ' ' << d << ' ' << e << endl; std::cout << a << ' ' << b << ' ' << c << ' ' << d << ' ' << e << std::endl;
a *= 3; a *= 3;
b *= 0.3; b *= 0.3;
c *= e; c *= e;
cout << a << ' ' << b << ' ' << c << ' ' << d << endl; std::cout << a << ' ' << b << ' ' << c << ' ' << d << std::endl;
a /= 3; a /= 3;
b /= 0.3; b /= 0.3;
c = d * 0.05; c = d * 0.05;
cout << a << ' ' << b << ' ' << c << ' ' << d << endl; std::cout << a << ' ' << b << ' ' << c << ' ' << d << std::endl;
F16 f = a/d; F16 f = a/d;
cout << f << ' ' << f+0.5 << endl; std::cout << f << ' ' << f+0.5 << std::endl;
} }

4
Logger.cpp
View File

@ -36,8 +36,6 @@
#include "Threads.h" // pat added #include "Threads.h" // pat added
using namespace std;
// Reference to a global config table, used all over the system. // Reference to a global config table, used all over the system.
extern ConfigurationTable gConfig; extern ConfigurationTable gConfig;
@ -202,7 +200,7 @@ Log::~Log()
// Save alarms in the local list and echo them to stderr. // Save alarms in the local list and echo them to stderr.
if (mPriority <= LOG_CRIT) { if (mPriority <= LOG_CRIT) {
if (sLoggerInited) addAlarm(mStream.str().c_str()); if (sLoggerInited) addAlarm(mStream.str().c_str());
cerr << mStream.str() << endl; cerr << mStream.str() << std::endl;
} }
// Current logging level was already checked by the macro. // Current logging level was already checked by the macro.
// So just log. // So just log.

2
sqlite3util.cpp
View File

@ -14,8 +14,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
using namespace std;
// Wrappers to sqlite operations. // Wrappers to sqlite operations.
// These will eventually get moved to commonlibs. // These will eventually get moved to commonlibs.