Update of /cvsroot/objecthandler/ObjectHandler/ohxl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12155/ohxl
Modified Files:
objecthandlerxl.cpp
Log Message:
auto_linking
Index: objecthandlerxl.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** objecthandlerxl.cpp 19 May 2006 15:12:41 -0000 1.1
--- objecthandlerxl.cpp 25 May 2006 17:01:57 -0000 1.2
***************
*** 20,23 ****
--- 20,31 ----
#include <ohxl/instancenamexl.hpp>
#include <ohxl/conversions.hpp>
+ /* Use BOOST_MSVC instead of _MSC_VER since some other vendors (Metrowerks,
+ for example) also #define _MSC_VER
+ */
+ #ifdef BOOST_MSVC
+ # define BOOST_LIB_DIAGNOSTIC
+ # include <xlsdk/auto_link.hpp>
+ # undef BOOST_LIB_DIAGNOSTIC
+ #endif
#include <iostream>
#include <iomanip>
***************
*** 28,32 ****
namespace ObjHandler {
! std::string ObjectHandlerXL::storeObject(const std::string &instanceName,
const obj_ptr &object) {
object->setInstanceName(boost::shared_ptr < Object::InstanceName > (new InstanceNameXL(instanceName)));
--- 36,40 ----
namespace ObjHandler {
! std::string ObjectHandlerXL::storeObject(const std::string &instanceName,
const obj_ptr &object) {
object->setInstanceName(boost::shared_ptr < Object::InstanceName > (new InstanceNameXL(instanceName)));
***************
*** 61,65 ****
}
! bool ObjectHandlerXL::nameIsFull(const std::string &name) const {
static const boost::regex NAME_REGEX(".*~_[\\da-f]{5}");
return regex_match(name, NAME_REGEX);
--- 69,73 ----
}
! bool ObjectHandlerXL::nameIsFull(const std::string &name) const {
static const boost::regex NAME_REGEX(".*~_[\\da-f]{5}");
return regex_match(name, NAME_REGEX);
|
