diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-07-18 16:27:20 +0200 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 12:49:28 -0500 |
| commit | 614cfc0d1dbee554513ea345595f445e5b9ad7c1 (patch) | |
| tree | 0b53ddb760c219e234fb7c32fff39622eddefb6f | |
| parent | f7612da13ee5cc1fec02cf237d42fa9fc7ea1a5b (diff) | |
| download | ATCD-614cfc0d1dbee554513ea345595f445e5b9ad7c1.tar.gz | |
Merge pull request #1887 from jwillemsen/jwi-codesetregistry
Minor change for codeset registry generation and removed old Id tags
(cherry picked from commit bd92596bbc63635a2ed2131322e6c659a5420586)
| -rw-r--r-- | ACE/apps/mkcsregdb/mkcsregdb.cpp | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp | 1 | ||||
| -rw-r--r-- | TAO/utils/catior/Catior_i.cpp | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ACE/apps/mkcsregdb/mkcsregdb.cpp b/ACE/apps/mkcsregdb/mkcsregdb.cpp index bb6c427d0d2..afc194e3eb9 100644 --- a/ACE/apps/mkcsregdb/mkcsregdb.cpp +++ b/ACE/apps/mkcsregdb/mkcsregdb.cpp @@ -248,7 +248,6 @@ csdb_generator::init_output (const char *srcfile) -1); outf_ = ACE_OS::fdopen (fd, "w"); - ACE_OS::fprintf (outf_,"// $ID: $\n"); ACE_OS::fprintf (outf_,"/*\n * Codeset registry DB, generated %s * source: %s\n", ACE_OS::asctime (ACE_OS::localtime(&now)), srcfile); @@ -258,7 +257,7 @@ csdb_generator::init_output (const char *srcfile) ACE_OS::fprintf (outf_," * a text file containing all the desired codeset information, build and run\n"); ACE_OS::fprintf (outf_," * mkcsregdb. The source is in $ACE_ROOT/apps/mkcsregdb. It will generate a new\n"); ACE_OS::fprintf (outf_," * copy of this file, with the registry_db_ array properly initialized.\n */\n"); - ACE_OS::fprintf (outf_,"\n#include \"ace/Codeset_Registry.h\"\n\n%s\n%s\n{\n", + ACE_OS::fprintf (outf_,"\n#include \"ace/Codeset_Registry.h\"\n\nACE_BEGIN_VERSIONED_NAMESPACE_DECL\n\n%s\n%s\n{\n", "ACE_Codeset_Registry::registry_entry const", "ACE_Codeset_Registry::registry_db_[] ="); return 0; @@ -302,7 +301,7 @@ csdb_generator::fini_output (const char *tgt) ACE_OS::sprintf (target,"%s/ace/%s",ace_src_,tgt); if (count_ == 0) write_dummy_entry(); - ACE_OS::fprintf (outf_,"\n};\n\nsize_t const ACE_Codeset_Registry::num_registry_entries_ = %d;\n\n",count_); + ACE_OS::fprintf (outf_,"\n};\n\nsize_t const ACE_Codeset_Registry::num_registry_entries_ = %d;\n\nACE_END_VERSIONED_NAMESPACE_DECL\n",count_); ACE_OS::fclose (outf_); ACE_stat buf; if (ACE_OS::stat (target,&buf) == 0) diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 1190037fc93..95e2648cc07 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -235,7 +235,6 @@ ACE_Scheduler_Factory::server (void) } static char header[] = -"// $Id $\n\n" "// This file was automatically generated by the Scheduler_Factory.\n" "// Before editing the file please consider generating it again.\n" "\n" diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index 917d965291b..344b85c517f 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -1100,7 +1100,7 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr) "for char.\n"), false); - ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for char %u\n", c_ccslen); + ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for char: %u\n", c_ccslen); buffer_ += buf; if (c_ccslen) @@ -1131,7 +1131,7 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr) "for wchar.\n"), false); - ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for wchar %u\n", w_ccslen); + ACE_OS::snprintf (buf, bufsize, "\tNumber of CCS for wchar: %u\n", w_ccslen); buffer_ += buf; if (w_ccslen) |