Changeset 1374

Timestamp:

05/28/08 03:58:48 (6 months ago)

Author:

timdewhirst

Message:

OAL
- remove dependency on atlbase.h

Files:

• trunk/src/openassetlib/al/al.cpp (modified) (4 diffs)

trunk/src/openassetlib/al/al.cpp

@@ +1 @@
+/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */
 // al.cpp
 //
@@ -13 +14 @@
 #include <openassetlib/al/base64_codec.hpp>
 
+// opl
+#include <openpluginlib/pl/utf8_utils.hpp>
+namespace pl = olib::openpluginlib;
+
 #if defined( WIN32 ) && !defined( USE_LIBXML2 )
-#import <msxml6.dll>
-#pragma warning( disable : 4290 )
-#include <atlbase.h>
+# import <msxml6.dll>
+# pragma warning( disable : 4290 )
+# ifdef UNICODE
+pl::string tchar_to_string( const TCHAR* ct ) 
+{
+        // TCHAR should actually be a wchar_t here
+        return pl::to_string( pl::wstring( static_cast< const pl::wstring::value_type* >( ct ) ) );
+}
+# else
+#  error "UNICODE must be defined"
+# endif
 #else
-#include <libxml/tree.h>
-#include <libxml/parser.h>
+# include <libxml/tree.h>
+# include <libxml/parser.h>
 #endif
 
@@ -441 +454 @@
                         catch(_com_error& e)
                         {
-                                std::cout << "Exception (_com_error): " << CT2CA(e.ErrorMessage()) << std::endl;
+                                std::cout << "Exception (_com_error): " << tchar_to_string( e.ErrorMessage() ).c_str() << std::endl;
                                 return false;
                         }
@@ -531 +544 @@
                         catch(const _com_error& e)
                         {
-                                std::cout << "Exception (_com_error): " << CT2CA(e.ErrorMessage());
+                                std::cout << "Exception (_com_error): " << tchar_to_string( e.ErrorMessage() ).c_str() << std::endl;
                                 return set_ptr();
                         }