From f86b918f68263eb829e9c4728599fbf176d5e9fd Mon Sep 17 00:00:00 2001 From: schnetter Date: Mon, 10 Mar 2008 18:10:20 +0000 Subject: Remove source ID again; please use the build ID instead. git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@170 83718e91-0e4f-0410-abf4-91180603181f --- interface.ccl | 12 ------------ src/announce.cc | 13 ------------- src/id.cc | 20 -------------------- src/id.hh | 4 ---- 4 files changed, 49 deletions(-) diff --git a/interface.ccl b/interface.ccl index 95004d4..4568cda 100644 --- a/interface.ccl +++ b/interface.ccl @@ -21,18 +21,6 @@ USES FUNCTION UniqueConfigID -# Return a pointer to an unmodifiable C string -# which contains a unique ID for this source tree -CCTK_POINTER_TO_CONST \ -FUNCTION UniqueSourceID (CCTK_POINTER_TO_CONST IN cctkGH) - -PROVIDES FUNCTION UniqueSourceID \ - WITH Formaline_UniqueSourceID \ - LANGUAGE C -USES FUNCTION UniqueSourceID - - - # Return a pointer to an unmodifiable C string # which contains a unique ID for this build CCTK_POINTER_TO_CONST \ diff --git a/src/announce.cc b/src/announce.cc index f800921..35aa466 100644 --- a/src/announce.cc +++ b/src/announce.cc @@ -111,15 +111,6 @@ namespace Formaline fil << get_config_id (cctkGH) << endl; fil.close (); } - { - ostringstream filenamebuf; - filenamebuf << out_dir << "/formaline-" << get_source_id (cctkGH); - string const filenamestring = filenamebuf.str(); - ofstream fil; - fil.open (filenamestring.c_str(), ios::trunc); - fil << get_source_id (cctkGH) << endl; - fil.close (); - } { ostringstream filenamebuf; filenamebuf << out_dir << "/formaline-" << get_build_id (cctkGH); @@ -363,10 +354,6 @@ namespace Formaline stores.store ("config_id", get_config_id (cctkGH)); } - { - stores.store ("source_id", get_source_id (cctkGH)); - } - { stores.store ("build_id", get_build_id (cctkGH)); } diff --git a/src/id.cc b/src/id.cc index 96b3224..107df4b 100644 --- a/src/id.cc +++ b/src/id.cc @@ -45,9 +45,6 @@ namespace Formaline // Configuration ID extern "C" char const * const config_id; - // Unique source tree ID - extern "C" char const * const source_id; - // Unique build ID extern "C" char const * const build_id; @@ -62,15 +59,6 @@ namespace Formaline - // Get the unique source id - char const * - get_source_id (cGH const * const cctkGH) - { - return source_id; - } - - - // Get the unique build id char const * get_build_id (cGH const * const cctkGH) @@ -207,13 +195,6 @@ namespace Formaline return static_cast (get_config_id (cctkGH)); } - extern "C" CCTK_POINTER_TO_CONST - Formaline_UniqueSourceID (CCTK_POINTER_TO_CONST const cctkGH_) - { - cGH const * const cctkGH = static_cast (cctkGH_); - return static_cast (get_source_id (cctkGH)); - } - extern "C" CCTK_POINTER_TO_CONST Formaline_UniqueBuildID (CCTK_POINTER_TO_CONST const cctkGH_) { @@ -241,7 +222,6 @@ namespace Formaline Formaline_PrintIDs () { CCTK_VInfo (CCTK_THORNSTRING, "Configuration id: %s", get_config_id (0)); - CCTK_VInfo (CCTK_THORNSTRING, "Source id: %s", get_source_id (0)); CCTK_VInfo (CCTK_THORNSTRING, "Build id: %s", get_build_id (0)); CCTK_VInfo (CCTK_THORNSTRING, "Simulation id: %s", get_simulation_id (0)); CCTK_VInfo (CCTK_THORNSTRING, "Run id: %s", get_run_id (0)); diff --git a/src/id.hh b/src/id.hh index 0cd5a6e..1bfeb56 100644 --- a/src/id.hh +++ b/src/id.hh @@ -10,10 +10,6 @@ namespace Formaline char const * get_config_id (cGH const * const cctkGH); - // Get the unique source tree id - char const * - get_source_id (cGH const * const cctkGH); - // Get the unique build id char const * get_build_id (cGH const * const cctkGH); -- cgit v1.2.3