diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-25 18:26:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 18:26:29 +0200 |
| commit | 15917ee25836f6704604a49e2aa76f8fb1423734 (patch) | |
| tree | f8c8625b06cf5dc3b389b3c840b91aabc3b7f483 | |
| parent | 1e957f1a2ec8bc811ec8f226d18d0590bc466e33 (diff) | |
| parent | c970fefc4240a16c613ac35abd99f533c2fb8256 (diff) | |
| download | ATCD-15917ee25836f6704604a49e2aa76f8fb1423734.tar.gz | |
Merge pull request #644 from jwillemsen/jwi-incorrectportablserverlogging
Fixed incorrect ascii logging
5 files changed, 5 insertions, 6 deletions
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp index 35a5119f07d..3cf57936cb8 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp @@ -34,7 +34,7 @@ namespace TAO if (strategy == 0) TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_name)); return strategy; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index 3605e61b739..fe25b407ce8 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -33,8 +33,7 @@ namespace TAO public: IdUniquenessStrategyUnique (void); - virtual void strategy_init (TAO_Root_POA *poa - ); + virtual void strategy_init (TAO_Root_POA *poa); virtual void strategy_cleanup (void); diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp index a488aeaa7c9..14746777670 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp @@ -36,7 +36,7 @@ namespace TAO if (strategy == 0) TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_name)); return strategy; diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp index d7e4388c991..30b613043d9 100644 --- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp @@ -36,7 +36,7 @@ namespace TAO strategy = strategy_factory->create (value); else TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_name)); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp index 79988662a34..6d10a72164d 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp @@ -39,7 +39,7 @@ namespace TAO { if (TAO_debug_level > 1) TAOLIB_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) ERROR, Unable to get %s\n"), + ACE_TEXT ("(%P|%t) ERROR, Unable to get %C\n"), strategy_factory_name)); return 0; |