jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleaning in namespaces

This commit is contained in:
Christophe Alexandre 2008-03-28 09:50:18 +00:00
parent 68760f612d
commit 8b253627e5
14 changed files with 38 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chamsin/src/analogic/GenTrans.h
View File

@ -161,8 +161,7 @@
( (long)(getValue(box.getYMax()))%2==0 )
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
class GenTrans {
// *************
@ -214,7 +213,6 @@ class GenV1Trans : public GenTrans {
};
END_NAMESPACE_HURRICANE
}
#endif

8
chamsin/src/analogic/GenV1Trans.cpp
View File

@ -15,10 +15,7 @@
#include "DataBase.h"
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
// ****************************************************************************************************
@ -535,5 +532,4 @@ END_IF
}
END_NAMESPACE_HURRICANE
}

7
chamsin/src/analogic/MetaTransistor.cpp
View File

@ -11,8 +11,7 @@
#include "UpdateSession.h"
#include "Vertical.h"
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
// ****************************************************************************************************
// MetaTransistor implementation
@ -172,6 +171,4 @@ Record* MetaTransistor::_getRecord() const
return record;
}
END_NAMESPACE_HURRICANE
}

9
chamsin/src/analogic/Transistor.cpp
View File

@ -13,8 +13,7 @@
#include "UpdateSession.h"
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
// ****************************************************************************************************
// Transistor::MaskVersion implementation
@ -440,16 +439,16 @@ void Transistor::DuplicateLayout(Transistor* transistor)
}
END_NAMESPACE_HURRICANE
}
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string getString(const H::Transistor::MaskInfo& masqueinfo)
string getString(const Hurricane::Transistor::MaskInfo& masqueinfo)
// **********************************************************
{
return masqueinfo._getString();
}

5
chamsin/src/analogic/Transistor.h
View File

@ -318,18 +318,17 @@ template<>
}
# endif
#endif
}
//END_NAMESPACE_HURRICANE
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string getString(const H::Transistor::MaskInfo&);
string getString(const Hurricane::Transistor::MaskInfo&);
#endif // HURRICANE_TRANSISTOR

5
chamsin/src/analogic/Transistors.h
View File

@ -10,7 +10,8 @@
#include "Collection.h"
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
class Transistor;
@ -53,7 +54,7 @@ typedef GenericFilter<Transistor*> TransistorFilter;
END_NAMESPACE_HURRICANE
}
#endif // HURRICANE_TRANSISTORS

7
chamsin/src/analogic/TwoSpaces.cpp
View File

@ -6,8 +6,8 @@
#include "TwoSpaces.h"
namespace Hurricane {
BEGIN_NAMESPACE_HURRICANE
// ****************************************************************************************************
// Two Spaces definition.
@ -108,14 +108,13 @@ string TwoSpaces::_GetString() const
// ****************************************************************************************************
TwoSpaces ts(" ");
END_NAMESPACE_HURRICANE
}
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string GetString(const H::TwoSpaces& ts)
string GetString(const Hurricane::TwoSpaces& ts)
// ***********************************
{
return ts._GetString();

16
chamsin/src/analogic/TwoSpaces.h
View File

@ -5,13 +5,13 @@
// ***************************************************************
# ifndef HURRICANE_TWOSPACES
# define HURRICANE_TWOSPACES
#ifndef HURRICANE_TWOSPACES
#define HURRICANE_TWOSPACES
# include "Commons.h"
#include "Commons.h"
namespace Hurricane {
BEGIN_NAMESPACE_HURRICANE
// ****************************************************************************************************
// TwoSpaces declaration.
@ -55,18 +55,18 @@ class TwoSpaces {
// ****************************************************************************************************
extern TwoSpaces ts;
END_NAMESPACE_HURRICANE
}
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string GetString(const H::TwoSpaces&);
string GetString(const Hurricane::TwoSpaces&);
inline ostream& operator<<(ostream& stream, const H::TwoSpaces& ts)
inline ostream& operator<<(ostream& stream, const Hurricane::TwoSpaces& ts)
// ****************************************************************
{
return stream<< GetString(ts);
}
# endif // END HURRICANE_TWOSPACES
#endif // END HURRICANE_TWOSPACES

6
chamsin/src/dtr/DtrAccess.cpp
View File

@ -14,7 +14,7 @@
extern void ParseDtr(const char*, Hurricane::DtrAccess*);
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
// ****************************************************************************************************
@ -286,13 +286,13 @@ Record* DtrAccess::_getRecord() const
return record;
}
END_NAMESPACE_HURRICANE
}
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string getString(const H::DtrAccess& access)
string getString(const Hurricane::DtrAccess& access)
// **********************************************
{
return access._getString();

10
chamsin/src/dtr/DtrAccess.h
View File

@ -10,9 +10,6 @@
#include "Layer.h"
#include "Layers.h"
//BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
class DtrAccess {
@ -164,21 +161,18 @@ class DtrAccess {
public: map<string, int>& _getLabel2ModellingMap() { return _label2modellingMap; };
public: map<string, double>& _getLabel2SimpleCapaMimMap()
{ return _label2simplecapamimMap; };
# endif
#endif
};
}
//END_NAMESPACE_HURRICANE
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string getString(const H::DtrAccess&);
string getString(const Hurricane::DtrAccess&);
#endif // HURRICANE_DTRACCESS

9
chamsin/src/dtr/GenericDtrAccess.cpp
View File

@ -7,8 +7,7 @@
#include "DtrAccess.h"
#include "GenericDtrAccess.h"
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
// ****************************************************************************************************
// GenericDtrAccess implementation
@ -43,15 +42,13 @@ string GenericDtrAccess::_getString() const
}
END_NAMESPACE_HURRICANE
}
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string getString(const H::GenericDtrAccess& access)
string getString(const Hurricane::GenericDtrAccess& access)
// ************************************************
{
return access._getString();

4
chamsin/src/dtr/GenericDtrAccess.h
View File

@ -63,15 +63,13 @@ class GenericDtrAccess {
};
//END_NAMESPACE_HURRICANE
}
// ****************************************************************************************************
// Generic functions
// ****************************************************************************************************
string getString(const H::GenericDtrAccess&);
string getString(const Hurricane::GenericDtrAccess&);
#endif // HURRICANE_GENERICDTRACCESS

7
chamsin/src/dtr/RdsUnit.cpp
View File

@ -221,10 +221,7 @@ static void CalculateRdsUnit() {
}
BEGIN_NAMESPACE_HURRICANE
namespace Hurricane {
// ****************************************************************************************************
// Utilitarians
@ -255,4 +252,4 @@ const long& getRdsLambda()
}
END_NAMESPACE_HURRICANE
}

2
chamsin/src/tests/AnalogicTest.cpp
View File

@ -2,7 +2,7 @@
#include "Library.h"
#include "Warning.h"
using namespace H;
using namespace Hurricane;
#include "crlcore/CDataBase.h"
using namespace CRL;