Merge branch 'master' into jwi-proxysource

RemedyIT · Apr 18, 2024 · ff034f5 · ff034f5
2 parents 207dbc8 + 35f163c
commit ff034f5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/ridlbe/c++11/templates/cli/hdr/valuebox_def.erb b/ridlbe/c++11/templates/cli/hdr/valuebox_def.erb
@@ -29,7 +29,7 @@ protected:
   template <typename _Tp1, typename, typename ...Args>
   friend constexpr TAOX11_CORBA::valuetype_reference<_Tp1> TAOX11_CORBA::make_reference(Args&& ...args);
 
-  static const std::string __<%= cxxname.downcase %>_repository_id;
+  static inline const std::string __<%= cxxname.downcase %>_repository_id {"<%= repository_id %>"};
 
   <%= cxxname %> () = default;
   <%= cxxname %> (const <%= cxxname %>&) = default;

diff --git a/ridlbe/c++11/templates/cli/hdr/valuetype_pre.erb b/ridlbe/c++11/templates/cli/hdr/valuetype_pre.erb
@@ -47,7 +47,7 @@ protected:
 % end
   using _shared_ptr_type = std::shared_ptr<<%= cxxname %>>;
 
-  static const std::string __<%= cxxname.downcase %>_repository_id;
+  static inline const std::string __<%= cxxname.downcase %>_repository_id {"<%= repository_id %>"};
 
 % if is_truncatable?
   <%= cxxname %> ();

diff --git a/ridlbe/c++11/templates/cli/src/valuebox_def.erb b/ridlbe/c++11/templates/cli/src/valuebox_def.erb
@@ -1,7 +1,5 @@
 
 // generated from <%= ridl_template_path %>
-const std::string <%= scoped_cxxname %>::__<%= cxxname.downcase %>_repository_id {"<%= repository_id %>"};
-
 TAOX11_IDL::traits<TAOX11_CORBA::ValueBase>::ref_type
 <%= scoped_cxxname %>::_copy_value () const
 {

diff --git a/ridlbe/c++11/templates/cli/src/valuetype_pre.erb b/ridlbe/c++11/templates/cli/src/valuetype_pre.erb
@@ -51,8 +51,6 @@ bool
   return true;
 }
 
-const std::string <%= cxxname %>::__<%= cxxname.downcase %>_repository_id {"<%= repository_id %>"};
-
 const std::string&
 <%= cxxname %>::_obv_repository_id () const
 {

diff --git a/tests/string/client.cpp b/tests/string/client.cpp
@@ -52,13 +52,13 @@ main(int argc, char* argv[])
     {
       TAOX11_TEST_DEBUG << "Test string type." << std::endl;
       std::string getText = hello->get_string ();
-      if (getText != "Hello there!")
+      if (getText != test_string)
       {
         TAOX11_TEST_ERROR << "ERROR: hello->get_string() returned an unexpected value. "
-          << "expected <Hello there!>, received <" << getText << ">" << std::endl;
+          << "expected <" << test_string << ">, received <" << getText << ">" << std::endl;
         ++result;
       }
-      hello->set_string ("Hello there!");
+      hello->set_string (test_string);
     }
 
     {
@@ -75,7 +75,7 @@ main(int argc, char* argv[])
 
     {
       TAOX11_TEST_DEBUG << "Test string type inout parameter." << std::endl;
-      std::string inoutText = "Hello there!";
+      std::string inoutText = test_string;
       hello->inout_string (inoutText);
       if (inoutText != "I hear you!")
       {

diff --git a/tests/string/hello.cpp b/tests/string/hello.cpp
@@ -20,16 +20,16 @@ Hello::Hello (IDL::traits<CORBA::ORB>::ref_type orb, int& result)
 std::string
 Hello::get_string ()
 {
-  return "Hello there!";
+  return test_string;
 }
 
 void
 Hello::set_string (const std::string& text)
 {
-  if (text != "Hello there!")
+  if (text != test_string)
   {
     TAOX11_TEST_ERROR << "ERROR: Hello::set_string received an unexpected value. "
-      << "expected <Hello there!>, received <" << text <<">" << std::endl;
+      << "expected <" << test_string << ">, received <" << text <<">" << std::endl;
     ++this->result_;
   }
 }
@@ -43,10 +43,10 @@ Hello::out_string (std::string& text)
 void
 Hello::inout_string (std::string& text)
 {
-  if (text != "Hello there!")
+  if (text != test_string)
   {
     TAOX11_TEST_ERROR << "ERROR: Hello::inout_string received an unexpected value. "
-      << "expected <Hello there!>, received <" << text << ">" << std::endl;
+      << "expected <" << test_string << "!>, received <" << text << ">" << std::endl;
     ++this->result_;
   }
   text = "I hear you!";

diff --git a/tests/string/test.idl b/tests/string/test.idl
@@ -8,6 +8,7 @@
 #include "orb.idl"
 
 const string name = "testing";
+const string test_string = "Hello there!";
 
 /// Put the interfaces in a module, to avoid global namespace pollution
 module Test