Review: Needs Fixing

Indeed the fix is OK for the VS10 build.

However, the NMAKE build is still broken due to a separate issue: please see 
attached error details.

If you think it's best we can open a new bug for the Windows NMAKE build and 
approve this fix for VS10 build.



C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(173) : error C2953:
 'std::default_delete' : class template has already been defined
        C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(20
53) : see declaration of 'std::default_delete'
C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(186) : error C2953:
 'std::default_delete' : class template has already been defined
        C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(20
53) : see declaration of 'std::default_delete'
C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(200) : warning C434
8: 'std::unique_ptr' : redefinition of default parameter : parameter 2
        C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(21
92) : see declaration of 'std::unique_ptr'
C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(437) : error C2953:
 'std::unique_ptr' : class template has already been defined
        C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(21
92) : see declaration of 'std::unique_ptr'
C:\work\FLWOR\bug_962881\include\zorba/internal/unique_ptr.h(542) : error C2953:
 'std::unique_ptr' : class template has already been defined
        C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\memory(21
92) : see declaration of 'std::unique_ptr'
NMAKE : fatal error U1077: 'C:\PROGRA~2\MICROS~2.0\VC\bin\cl.exe' : return code
'0x2'
Stop.
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio 10.0
\VC\BIN\nmake.exe"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio 10.0
\VC\BIN\nmake.exe"' : return code '0x2'
Stop.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug972855/+merge/100697
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to