summaryrefslogtreecommitdiff
path: root/CIAO/CIDLC/ServantGenerator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/CIDLC/ServantGenerator.cpp')
-rw-r--r--CIAO/CIDLC/ServantGenerator.cpp26
1 files changed, 8 insertions, 18 deletions
diff --git a/CIAO/CIDLC/ServantGenerator.cpp b/CIAO/CIDLC/ServantGenerator.cpp
index f817087b92d..81aa3c51f81 100644
--- a/CIAO/CIDLC/ServantGenerator.cpp
+++ b/CIAO/CIDLC/ServantGenerator.cpp
@@ -6,6 +6,7 @@
#include "ServantHeaderGenerator.hpp"
#include "ServantSourceGenerator.hpp"
#include "CxxNamePrinter.hpp"
+#include "Upcase.hpp"
#include "CCF/CodeGenerationKit/Regex.hpp"
#include "CCF/CodeGenerationKit/IndentationCxx.hpp"
@@ -19,17 +20,6 @@ using namespace Traversal;
using std::string;
using std::ostream;
-namespace
-{
- // On some platforms toupper can be something else than a
- // function.
- int
- upcase (int c)
- {
- return toupper (c);
- }
-}
-
ServantGenerator::ServantGenerator (CommandLine const& cl)
: cl_ (cl),
file_name_ (""),
@@ -71,7 +61,7 @@ void ServantGenerator::options (CL::Description& d)
"svnt-export-macro",
"macro",
"Replace default servant DLL export macro "
- "with provided ,acro.",
+ "with provided macro.",
CL::OptionType::value));
d.add_option (CL::OptionDescription (
@@ -92,6 +82,11 @@ void ServantGenerator::options (CL::Description& d)
"type",
"Generate code for custom container of the provided type.",
CL::OptionType::value));
+
+ d.add_option (CL::OptionDescription (
+ "static-config",
+ "No dynamic configuration, no locks on state access.",
+ CL::OptionType::flag));
}
@@ -158,12 +153,7 @@ ServantGenerator::compute_export_macro (const fs::path& file_path)
{
// Modify a copy of the filename string.
export_macro_ = file_name_;
-
- // Convert filename string to upper case.
- transform (export_macro_.begin (),
- export_macro_.end (),
- export_macro_.begin (),
- upcase);
+ str_upcase (export_macro_);
// Replace the suffix.
export_macro_ =