msvc8 + toolkit fixes
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@426 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
parent
b2b3acaadb
commit
29e7199a27
4 changed files with 8 additions and 2 deletions
2
CHANGES
2
CHANGES
|
@ -30,7 +30,7 @@ TypeTraits:
|
||||||
flex_string:
|
flex_string:
|
||||||
- fixed compare bug by updating (Thanks to Justin Matthews, pk)
|
- fixed compare bug by updating (Thanks to Justin Matthews, pk)
|
||||||
- fixed seg faults on linux and windows (pk)
|
- fixed seg faults on linux and windows (pk)
|
||||||
- improved error reporting of the test program
|
- improved error reporting of the test program (pk)
|
||||||
|
|
||||||
SmartPtr:
|
SmartPtr:
|
||||||
- make object level locking possible (Thanks to Ryan Smith, pk)
|
- make object level locking possible (Thanks to Ryan Smith, pk)
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
#include "Typelist.h"
|
#include "Typelist.h"
|
||||||
#include "Sequence.h"
|
#include "Sequence.h"
|
||||||
|
|
||||||
|
#if (defined _MSC_VER) && (_MSC_VER < 1400)
|
||||||
|
#include <string>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Loki
|
namespace Loki
|
||||||
{
|
{
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -157,6 +157,8 @@ private:
|
||||||
|
|
||||||
#ifdef LOKI_NONCC
|
#ifdef LOKI_NONCC
|
||||||
#include "../../include/noncc/loki/Singleton.cpp"
|
#include "../../include/noncc/loki/Singleton.cpp"
|
||||||
|
#else
|
||||||
|
#include "../../src/Singleton.cpp"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2,5 +2,5 @@ if not exist tmp\ mkdir tmp
|
||||||
|
|
||||||
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Test.cpp
|
cl -c -Zm200 -O2 -DNDEBUG -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -Fotmp\ Test.cpp
|
||||||
|
|
||||||
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" tmp\Test.obj
|
link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" ..\..\lib\loki.lib tmp\Test.obj
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue