cleanup: dcomplex refactored, conflicts resolved

ippl/test/FFT/TestFFT-2.cpp

@@ -27,12 +27,7 @@
 
 #include "Ippl.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <complex>
-using namespace std;
-#else
-#include <complex.h>
-#endif
 
 enum TestCases {test1,test2};
 

ippl/test/FFT/TestFFT-XT3.cpp

@@ -30,12 +30,7 @@
 
 #include "Ippl.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <complex>
-using namespace std;
-#else
-#include <complex.h>
-#endif
 
 #define THREED
 

ippl/test/FFT/TestRCMIC.cpp

@@ -14,12 +14,7 @@
 #include "Ippl.h"
 
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <complex>
-using namespace std;
-#else
-#include <complex.h>
-#endif
 
 #ifdef IPPL_DKS
 #include "DKSOPAL.h"

ippl/test/simple/ScalarAdvection.cpp

@@ -44,12 +44,7 @@
 #include "Ippl.h"
 #include "Clock.h" // Borrowed from IPPL 2.
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <iostream>
-using namespace std;
-#else
-#include <iostream>
-#endif
 
 #include <stdio.h>
 

ippl/test/simple/TestParticleDebug.cpp

@@ -47,14 +47,8 @@
 #include "Utility/ParticleDebug.h"
 #include "Utility/FieldDebug.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <iostream>
 #include <fstream>
-using namespace std;
-#else
-#include <iostream>
-#include <fstream>
-#endif
 
 //-----------------------------------------------------------------------------
 // Simple user Particles class definition

ippl/test/simple/TestParticleDebugParallel.cpp

@@ -52,12 +52,7 @@
 #include "Utility/ParticleDebug.h"
 #include "Utility/FieldDebug.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <iostream>
-using namespace std;
-#else
-#include <iostream>
-#endif
 
 //-----------------------------------------------------------------------------
 // Simple user Particles class definition
@@ -246,4 +241,4 @@ int main(int argc, char *argv[])
  * $RCSfile: TestParticleDebugParallel.cpp,v $   $Author: adelmann $
  * $Revision: 1.1.1.1 $   $Date: 2003/01/23 07:40:39 $
  * IPPL_VERSION_ID: $Id: TestParticleDebugParallel.cpp,v 1.1.1.1 2003/01/23 07:40:39 adelmann Exp $
- ***************************************************************************/
\ No newline at end of file
+ ***************************************************************************/

ippl/test/simple/TestPeriodicBC.cpp

@@ -30,12 +30,7 @@
 #include "Ippl.h"
 #include "Utility/FieldDebug.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <fstream>
-using namespace std;
-#else
-#include <fstream>
-#endif
 
 typedef ParticleSpatialLayout<double,3>::SingleParticlePos_t Vector_t;
 

ippl/test/simple/bc.cpp

@@ -33,12 +33,7 @@
 #include "Field/BCond.h"
 #include "Meshes/UniformCartesian.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <iostream>
-using namespace std;
-#else
-#include <iostream>
-#endif
 
 // define helper print function
 void printout(Field<double,2>& A)

ippl/test/simple/bc2.cpp

@@ -36,12 +36,7 @@
 #include "Meshes/UniformCartesian.h"
 #include "AppTypes/Vektor.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <iostream>
-using namespace std;
-#else
-#include <iostream>
-#endif
 
 // set dimensionality
 const unsigned Dim=2;

ippl/test/simple/bc3.cpp

@@ -33,12 +33,7 @@
 #include "Field/BCond.h"
 #include "Meshes/UniformCartesian.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <iostream>
-using namespace std;
-#else
-#include <iostream>
-#endif
 
 //
 // Print out an array including the guard cells.

ippl/test/simple/bool.cpp

@@ -32,14 +32,8 @@
 #include "Meshes/UniformCartesian.h"
 #include "Message/Communicate.h"
 
-#ifdef IPPL_USE_STANDARD_HEADERS
 #include <iostream>
 #include <fstream>
-using namespace std;
-#else
-#include <iostream>
-#include <fstream>
-#endif
 
 #include <stdlib.h>
 #include <stdio.h>