Update of /cvsroot/objecthandler/ObjectHandler/oh
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26746/oh
Modified Files:
auto_link.hpp singleton.hpp
Log Message:
discontinue support for VC6
Index: singleton.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/singleton.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** singleton.hpp 19 May 2006 15:12:41 -0000 1.1
--- singleton.hpp 16 Jul 2006 10:17:34 -0000 1.2
***************
*** 61,67 ****
void initialize() {}
private:
- #ifdef OBJHANDLER_PATCH_MSVC6
- static boost::shared_ptr<T> instance_;
- #endif
Singleton(const Singleton&) {}
void operator=(const Singleton&) {}
--- 61,64 ----
***************
*** 70,83 ****
// template definitions
- #ifdef OBJHANDLER_PATCH_MSVC6
- template <class T>
- boost::shared_ptr<T> Singleton<T>::instance_;
- #endif
-
template <class T>
T& Singleton<T>::instance() {
- #ifndef OBJHANDLER_PATCH_MSVC6
static boost::shared_ptr<T> instance_;
- #endif
if (!instance_) {
instance_ = boost::shared_ptr<T>(new T);
--- 67,73 ----
Index: auto_link.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/auto_link.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** auto_link.hpp 25 May 2006 17:01:57 -0000 1.1
--- auto_link.hpp 16 Jul 2006 10:17:34 -0000 1.2
***************
*** 21,28 ****
// select toolset:
! #if (_MSC_VER < 1200)
# error "unsupported Microsoft compiler"
- #elif (_MSC_VER == 1200)
- # define OBJHANDLER_LIB_TOOLSET "vc6"
#elif (_MSC_VER == 1300)
# define OBJHANDLER_LIB_TOOLSET "vc7"
--- 21,26 ----
// select toolset:
! #if (_MSC_VER < 1300)
# error "unsupported Microsoft compiler"
#elif (_MSC_VER == 1300)
# define OBJHANDLER_LIB_TOOLSET "vc7"
|