Update of /cvsroot/objecthandler/ObjectHandler/oh
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27209/oh
Modified Files:
Makefile.am object.hpp objecthandler.hpp
Log Message:
updates for linux/autoconf/gcc4.1.0
Index: object.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/object.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** object.hpp 19 Jul 2006 16:39:27 -0000 1.12
--- object.hpp 26 Jul 2006 09:36:15 -0000 1.13
***************
*** 28,33 ****
--- 28,35 ----
#include <oh/valueobject.hpp>
#include <oh/objhandlerdefines.hpp>
+ #include <oh/exception.hpp>
#include <vector>
#include <string>
+ #include <sstream>
#include <iostream>
***************
*** 148,161 ****
std::ostringstream msg;
msg << "Error retrieving library object - unable to convert reference"
! " from type " << std::endl << " " << typeid(LibraryClass).name() <<
! " to type " << std::endl << " " << typeid(LibraryDerivedClass).name();
throw Exception(msg.str());
}
}
! template <>
! /*const*/ boost::shared_ptr<LibraryClass> getLibraryObject<LibraryClass>() const {
! return libraryObject_;
! }
protected:
boost::shared_ptr<LibraryClass> libraryObject_;
--- 150,164 ----
std::ostringstream msg;
msg << "Error retrieving library object - unable to convert reference"
! << " from type " << std::endl << " " << typeid(LibraryClass).name()
! << " to type " << std::endl << " " << typeid(LibraryDerivedClass).name();
throw Exception(msg.str());
}
}
! // temporarily commented out - need to fix the syntax for gcc 4.1.0
! //template <>
! ///*const*/ boost::shared_ptr<LibraryClass> getLibraryObject<LibraryClass>() const {
! // return libraryObject_;
! //}
protected:
boost::shared_ptr<LibraryClass> libraryObject_;
Index: Makefile.am
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am 19 May 2006 15:12:41 -0000 1.1
--- Makefile.am 26 Jul 2006 09:36:15 -0000 1.2
***************
*** 3,10 ****
include_HEADERS = \
- config.hpp \
exception.hpp \
logger.hpp \
- objecthandlerbase.hpp \
objecthandler.hpp \
object.hpp \
--- 3,8 ----
***************
*** 16,23 ****
EXTRA_DIST = \
! autolink.hpp
lib_LTLIBRARIES = libObjectHandler.la
! LDFLAGS = -llog4cxx -lboost_regex-gcc -release $(PACKAGE_VERSION)
libObjectHandler_la_SOURCES = \
--- 14,21 ----
EXTRA_DIST = \
! auto_link.hpp
lib_LTLIBRARIES = libObjectHandler.la
! LDFLAGS = -llog4cxx -lboost_regex -release $(PACKAGE_VERSION)
libObjectHandler_la_SOURCES = \
***************
*** 25,29 ****
logger.cpp \
object.cpp \
! objecthandlerbase.cpp \
utilities.cpp
--- 23,27 ----
logger.cpp \
object.cpp \
! objecthandler.cpp \
utilities.cpp
Index: objecthandler.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandler.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** objecthandler.hpp 17 Jul 2006 10:11:39 -0000 1.9
--- objecthandler.hpp 26 Jul 2006 09:36:15 -0000 1.10
***************
*** 39,43 ****
public:
ObjectHandler();
! ~ObjectHandler();
static ObjectHandler &instance();
--- 39,43 ----
public:
ObjectHandler();
! virtual ~ObjectHandler();
static ObjectHandler &instance();
***************
*** 67,75 ****
}
! template <>
! boost::shared_ptr < Object > retrieveObject<Object>(
! const std::string &id) {
! return retrieveObjectImpl(id);
! }
//! Delete Object with given instance name.
--- 67,75 ----
}
! //template <>
! //boost::shared_ptr < Object > retrieveObject<Object>(
! // const std::string &id) {
! // return retrieveObjectImpl(id);
! //}
//! Delete Object with given instance name.
***************
*** 114,117 ****
--- 114,123 ----
};
+ template <>
+ inline boost::shared_ptr<Object> ObjectHandler::retrieveObject<Object>(
+ const std::string &id) {
+ return retrieveObjectImpl(id);
+ }
+
}
|