summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/ace/Framework_Component.cpp3
2 files changed, 8 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 4d10c0453f4..05e791108c7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 02 12:05:00 UTC 2008 Simon Massey <sma at prismtech dot com>
+
+ * ace/Framework_Component.cpp:
+
+ Annoying text constant problem in a build. No need for ACE_TEXT()
+ here.
+
Wed Jul 2 11:51:03 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
* tests/Makefile.am:
diff --git a/ACE/ace/Framework_Component.cpp b/ACE/ace/Framework_Component.cpp
index 95697c6e952..23bebc240f8 100644
--- a/ACE/ace/Framework_Component.cpp
+++ b/ACE/ace/Framework_Component.cpp
@@ -137,8 +137,7 @@ ACE_Framework_Repository::register_component (ACE_Framework_Component *fc)
fc->this_ == this->component_vector_[i]->this_)
{
ACE_ERROR_RETURN ((LM_ERROR,
- ACE_TEXT ("AFR::register_component: error, ")
- ACE_TEXT ("compenent already registered\n")),
+ "AFR::register_component: error, compenent already registered\n"),
-1);
}