From 566fcdea0c77c0536a550204f778cc7a1c124c97 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 28 Mar 2011 20:41:51 +0000
Subject: [PATCH] Took out namespaces from headers.

---
 Cantera/src/spectra/LineBroadener.cpp | 5 +++--
 Cantera/src/spectra/LineBroadener.h   | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cantera/src/spectra/LineBroadener.cpp b/Cantera/src/spectra/LineBroadener.cpp
index 167261e3d..5daa0ae4c 100644
--- a/Cantera/src/spectra/LineBroadener.cpp
+++ b/Cantera/src/spectra/LineBroadener.cpp
@@ -3,6 +3,7 @@
 #include "LineBroadener.h"
 
 using namespace std;
+using namespace Cantera;
 
 namespace CanteraSpectra {
 
@@ -20,7 +21,7 @@ namespace CanteraSpectra {
      * Units: 1/wavenumber (or cm).
      */
     doublereal Lorentzian::profile(doublereal deltaFreq) {
-        return (1.0/Pi) *m_hwhm/(deltaFreq*deltaFreq + m_hwhm2);
+        return (1.0/Cantera::Pi) *m_hwhm/(deltaFreq*deltaFreq + m_hwhm2);
     }
 
     /**
@@ -47,7 +48,7 @@ namespace CanteraSpectra {
         //cout << "entered Gaussian::profile" << endl;
         //cout << "deltaFreq = " << deltaFreq << endl;
         //cout << "m_sigma = " << m_sigma << endl;
-        return 1.0/(m_sigma*SqrtTwo*SqrtPi) * 
+        return 1.0/(m_sigma * Cantera::SqrtTwo *Cantera::SqrtPi) * 
             exp(-deltaFreq*deltaFreq/(2.0*m_sigma2));
     }
         
diff --git a/Cantera/src/spectra/LineBroadener.h b/Cantera/src/spectra/LineBroadener.h
index 30560d19d..ac7828939 100644
--- a/Cantera/src/spectra/LineBroadener.h
+++ b/Cantera/src/spectra/LineBroadener.h
@@ -7,7 +7,6 @@
 #include "ct_defs.h"
 #include "ctexceptions.h"
 
-using namespace Cantera;
 namespace CanteraSpectra {
 
     /**
@@ -38,7 +37,7 @@ namespace CanteraSpectra {
          * an exception will be thrown.
          */
         virtual doublereal profile(doublereal deltaFreq) {
-            throw CanteraError("LineBroadener::profile",
+            throw Cantera::CanteraError("LineBroadener::profile",
                 "base class method called!");
         }
 
@@ -53,7 +52,7 @@ namespace CanteraSpectra {
          * \f]
          */
         virtual doublereal cumulative(doublereal deltaFreq) {
-            throw CanteraError("LineBroadener::cumulative",
+            throw Cantera::CanteraError("LineBroadener::cumulative",
                 "base class method called!");
         }