Commit 20854de6 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Fix namespace pollution in library.

parent b720cadb
......@@ -37,6 +37,8 @@
#include <Collections/Operator.h>
#include <Collections/Collection.h>
using namespace std;
namespace Nektar {
namespace Collections {
......
......@@ -36,6 +36,8 @@
#include <Collections/Collection.h>
#include <sstream>
using namespace std;
namespace Nektar {
namespace Collections {
......
......@@ -36,6 +36,8 @@
#ifndef NEKTAR_LIBRARY_COLLECTIONS_COLLECTION_H
#define NEKTAR_LIBRARY_COLLECTIONS_COLLECTION_H
#include <vector>
#include <StdRegions/StdExpansion.h>
#include <SpatialDomains/Geometry.h>
#include <Collections/CollectionsDeclspec.h>
......@@ -56,8 +58,8 @@ class Collection
public:
COLLECTIONS_EXPORT Collection(
vector<StdRegions::StdExpansionSharedPtr> pCollExp,
OperatorImpMap &impTypes);
std::vector<StdRegions::StdExpansionSharedPtr> pCollExp,
OperatorImpMap &impTypes);
inline void ApplyOperator(
const OperatorType &op,
......@@ -81,7 +83,7 @@ class Collection
protected:
StdRegions::StdExpansionSharedPtr m_stdExp;
vector<SpatialDomains::GeometrySharedPtr> m_geom;
std::vector<SpatialDomains::GeometrySharedPtr> m_geom;
boost::unordered_map<OperatorType, OperatorSharedPtr> m_ops;
CoalescedGeomDataSharedPtr m_geomData;
......
......@@ -36,6 +36,8 @@
#include <Collections/CollectionOptimisation.h>
#include <LibUtilities/BasicUtils/ParseUtils.hpp>
using namespace std;
namespace Nektar
{
namespace Collections
......
......@@ -142,7 +142,7 @@ class CollectionOptimisation
// Get Map by doing autotuning testing.
COLLECTIONS_EXPORT OperatorImpMap SetWithTimings(
vector<StdRegions::StdExpansionSharedPtr> pGeom,
std::vector<StdRegions::StdExpansionSharedPtr> pGeom,
OperatorImpMap &impTypes,
bool verbose = true);
......@@ -152,10 +152,10 @@ class CollectionOptimisation
}
private:
typedef pair<LibUtilities::ShapeType, int> ElmtOrder;
typedef std::pair<LibUtilities::ShapeType, int> ElmtOrder;
static map<OpImpTimingKey,OperatorImpMap> m_opImpMap;
map<OperatorType, map<ElmtOrder, ImplementationType> > m_global;
static std::map<OpImpTimingKey,OperatorImpMap> m_opImpMap;
std::map<OperatorType, std::map<ElmtOrder, ImplementationType> > m_global;
bool m_setByXml;
bool m_autotune;
ImplementationType m_defaultType;
......
......@@ -36,6 +36,8 @@
#include <Collections/Collection.h>
#include <Collections/IProduct.h>
using namespace std;
namespace Nektar
{
namespace Collections
......
......@@ -38,6 +38,8 @@
#include <Collections/Collection.h>
#include <Collections/IProduct.h>
using namespace std;
namespace Nektar {
namespace Collections {
......
......@@ -38,6 +38,8 @@
#include <Collections/Collection.h>
#include <Collections/IProduct.h>
using namespace std;
namespace Nektar {
namespace Collections {
......
......@@ -46,7 +46,7 @@
static OperatorKey m_typeArr[]; \
friend class MemoryManager<cname>; \
static OperatorSharedPtr create( \
vector<StdRegions::StdExpansionSharedPtr> pCollExp, \
std::vector<StdRegions::StdExpansionSharedPtr> pCollExp,\
boost::shared_ptr<CoalescedGeomData> GeomData) \
{ \
return MemoryManager<cname> \
......@@ -99,7 +99,7 @@ const char* const ImplementationTypeMap[] =
typedef bool ExpansionIsNodal;
typedef map<OperatorType, ImplementationType> OperatorImpMap;
typedef std::map<OperatorType, ImplementationType> OperatorImpMap;
/// simple Operator Implementation Map generator
OperatorImpMap SetFixedImpType(ImplementationType defaultType);
......@@ -110,7 +110,7 @@ class Operator
public:
/// Constructor
Operator(
vector<StdRegions::StdExpansionSharedPtr> pCollExp,
std::vector<StdRegions::StdExpansionSharedPtr> pCollExp,
boost::shared_ptr<CoalescedGeomData> GeomData)
: m_stdExp(pCollExp[0]->GetStdExp()),
m_numElmt(pCollExp.size()),
......@@ -161,7 +161,7 @@ std::ostream &operator<<(std::ostream &os, OperatorKey const &p);
typedef Nektar::LibUtilities::NekFactory<
OperatorKey,
Operator,
vector<StdRegions::StdExpansionSharedPtr>,
std::vector<StdRegions::StdExpansionSharedPtr>,
CoalescedGeomDataSharedPtr> OperatorFactory;
/// Returns the singleton Operator factory object
......
......@@ -37,6 +37,8 @@
#include <Collections/Operator.h>
#include <Collections/Collection.h>
using namespace std;
namespace Nektar {
namespace Collections {
......
......@@ -46,6 +46,7 @@
#include <Collections/Collection.h>
#include <SpatialDomains/MeshGraph.h>
using namespace std;
using namespace Nektar;
using boost::timer::cpu_timer;
......
......@@ -11,8 +11,8 @@ using namespace std;
#include <LibUtilities/Foundations/Foundations.hpp>
#include <LibUtilities/Foundations/Points.h>
using namespace Nektar;
using namespace boost;
using namespace Nektar;
using namespace Nektar::LibUtilities;
int main(int argc, char *argv[])
......
......@@ -3,6 +3,7 @@
#include <LocalRegions/SegExp.h>
#include <SpatialDomains/SegGeom.h>
using namespace std;
using namespace Nektar;
static double solutionpoly(double x, int order);
......
......@@ -8,6 +8,7 @@
#include <LibUtilities/Foundations/Foundations.hpp>
using namespace std;
using namespace Nektar;
NekDouble Tri_sol(NekDouble x, NekDouble y, int order1, int order2);
......
......@@ -13,6 +13,7 @@
#include <SpatialDomains/MeshComponents.h>
#include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
using namespace std;
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::LocalRegions;
......
......@@ -3,6 +3,7 @@
#include <LocalRegions/SegExp.h>
#include <SpatialDomains/SegGeom.h>
using namespace std;
using namespace Nektar;
static double solutionpoly(double x, int order);
......
......@@ -8,6 +8,7 @@
#include <LibUtilities/Foundations/Foundations.hpp>
using namespace std;
using namespace Nektar;
NekDouble Tri_sol(NekDouble x, NekDouble y, int order1, int order2);
......
......@@ -13,6 +13,7 @@
#include <SpatialDomains/MeshComponents.h>
#include <LibUtilities/BasicConst/NektarUnivTypeDefs.hpp>
using namespace std;
using namespace Nektar;
using namespace Nektar::LibUtilities;
using namespace Nektar::LocalRegions;
......
......@@ -8,6 +8,7 @@
#include <SpatialDomains/MeshGraph1D.h>
#include <SpatialDomains/MeshGraph2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
......@@ -7,6 +7,7 @@
#include <MultiRegions/ContField3DHomogeneous1D.h>
#include <SpatialDomains/MeshGraph2D.h>
using namespace std;
using namespace Nektar;
int main(int argc, char *argv[])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment