summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-07-17 13:36:17 +0000
committermsmit <msmit@remedy.nl>2009-07-17 13:36:17 +0000
commit556917e489d39439c1b5d9dd9a05906a48dbd0e3 (patch)
tree89581710303839250625bc95a9ed322018a7e1d6
parentf838c678be620f59c913548a3c3db07dd2b721de (diff)
downloadATCD-556917e489d39439c1b5d9dd9a05906a48dbd0e3.tar.gz
Fri Jul 17 13:35:03 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ciao/Logger/File_Logger_Backend.h: Resolved UNICODE compiler errors.
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/ciao/Logger/File_Logger_Backend.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 19f4900737a..402e9ed3a81 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 17 13:35:03 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * ciao/Logger/File_Logger_Backend.h:
+ Resolved UNICODE compiler errors.
+
Fri Jul 17 12:48:09 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tools/Config_Handlers/ccd.cpp:
diff --git a/CIAO/ciao/Logger/File_Logger_Backend.h b/CIAO/ciao/Logger/File_Logger_Backend.h
index 99b899484c2..c3b8e1ec71b 100644
--- a/CIAO/ciao/Logger/File_Logger_Backend.h
+++ b/CIAO/ciao/Logger/File_Logger_Backend.h
@@ -23,7 +23,7 @@ namespace CIAO
{
public:
File_Logger_Backend (const ACE_TCHAR * fname)
- : fh_ (0), filename_ (fname) {}
+ : fh_ (0), filename_ ((char *)fname) {}
virtual ~File_Logger_Backend (void)
{
@@ -44,7 +44,7 @@ namespace CIAO
private:
FILE * fh_;
- ACE_TString filename_;
+ ACE_CString filename_;
};
} // CIAO