From d7a00c9126c8ab99daebd52adae4ece7797034d4 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 28 Mar 2011 20:39:34 +0000 Subject: [PATCH] Took out namespaces from headers. --- Cantera/src/spectra/rotor.cpp | 1 + Cantera/src/spectra/rotor.h | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cantera/src/spectra/rotor.cpp b/Cantera/src/spectra/rotor.cpp index ea9d7a31a..9b4770e20 100644 --- a/Cantera/src/spectra/rotor.cpp +++ b/Cantera/src/spectra/rotor.cpp @@ -11,6 +11,7 @@ #include "rotor.h" using namespace std; +using namespace Cantera; namespace CanteraSpectra { diff --git a/Cantera/src/spectra/rotor.h b/Cantera/src/spectra/rotor.h index 70e2ba6ab..b8d6aab18 100644 --- a/Cantera/src/spectra/rotor.h +++ b/Cantera/src/spectra/rotor.h @@ -14,7 +14,6 @@ */ #include "ct_defs.h" -using namespace Cantera; /** * Namespace for spectroscopic functions and classes. @@ -63,24 +62,24 @@ namespace CanteraSpectra { /** convert from Hz to wavenmbers */ inline doublereal hz_to_wnum(doublereal freq) { - return freq/(100.0*lightSpeed); + return freq/(100.0*Cantera::lightSpeed); } /** Convert from wavenumbers to Joules. */ inline doublereal wnum_to_J(doublereal w) { - return Planck * w * 100.0 * lightSpeed; + return Cantera::Planck * w * 100.0 * Cantera::lightSpeed; } inline doublereal J_to_wnum(doublereal e) { - return e /(Planck * 100.0 * lightSpeed); + return e /(Cantera::Planck * 100.0 * Cantera::lightSpeed); } inline doublereal wnum_to_eV(doublereal w) { - return Planck * w * 100.0 * lightSpeed / ElectronCharge; + return Cantera::Planck * w * 100.0 * Cantera::lightSpeed / Cantera::ElectronCharge; } inline doublereal eV_to_wnum(doublereal e) { - return e * ElectronCharge / (Planck * 100.0 * lightSpeed); + return e * Cantera::ElectronCharge / (Cantera::Planck * 100.0 * Cantera::lightSpeed); } }