diff --git a/source/trunk/include/CLASS.hxx b/source/trunk/include/CLASS.hxx index 8cd4313fbb3a81b752a027b44db907bd70947a5e..707f38ce1d86b053bfa89e4ee37a5edb9ccd752d 100755 --- a/source/trunk/include/CLASS.hxx +++ b/source/trunk/include/CLASS.hxx @@ -68,7 +68,7 @@ public : //********* Add Method *********// - void AddPool(Pool* Pool); ///< Add A TF to the Park + void AddPool(Pool* Pool); ///< Add A TF to the Park void AddReactor(Reactor* reactor); ///< Add a Reactor to the Park void AddStorage(Storage* storage); ///< Add a Storage to the Park void AddFabricationPlant(FabricationPlant* fabricationplant); ///< Add a Storage to the Park @@ -79,12 +79,12 @@ public : //********* Evolution Method *********// - void BuildTimeVector(cSecond t); ///< Build the Time Evolution Vector - void Evolution(double t); ///< Do the Evolution - void PoolEvolution(); ///< Do TF Evolution - void ReactorEvolution(); ///< Do the Reactor Evolution - void FabricationPlantEvolution(); ///< Do the FabricationPlant Evolution - void StorageEvolution(); ///< Do the Storage Evolution + void BuildTimeVector(cSecond t); ///< Build the Time Evolution Vector + void Evolution(double t); ///< Do the Evolution + void PoolEvolution(); ///< Do TF Evolution + void ReactorEvolution(); ///< Do the Reactor Evolution + void FabricationPlantEvolution(); ///< Do the FabricationPlant Evolution + void StorageEvolution(); ///< Do the Storage Evolution diff --git a/source/trunk/include/Defines.hxx b/source/trunk/include/Defines.hxx deleted file mode 100755 index d34d674a8c2f1fd5e354144d8c575c2e061d7deb..0000000000000000000000000000000000000000 --- a/source/trunk/include/Defines.hxx +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef DEFINES_H -#define DEFINES_H 1 - -//#define DEBUG - -#ifdef DEBUG -#define DBGL cout << __FILE__ << ":" << __LINE__ << "[" << __FUNCTION__ << "]" << endl; -#define DBGV(x) cout << __FILE__ << ":" << __LINE__ << "[" << __FUNCTION__ << "]" #x "='" << x << endl; -#else -#define DBGL -#define DBGV(x) -#endif - - -#endif