Martin Sebor wrote:
> Farid Zaripov wrote:
>
>> Martin, after that patch I got compiler (MSVC7.1) error:
>> ----------------
>> collate.cpp
>> c:\Incubator\stdcxx\trunk\src\podarray.cc(48) : error C2995:
>> '__rw::__rw_pod_array<_TypeT,_Size>
>> &__rw::__rw_pod_array<_TypeT,_Size>::append(const _TypeT
>> *,__rw::_SizeT)' : template function has already been defined
>> c:\Incubator\stdcxx\trunk\src\podarray.h(137) : see declaration
>> of '__rw::__rw_pod_array<_TypeT,_Size>::append'
>> ----------------
>>
>> The reason is double inclusion of the podarray.cc (first included in
>> #include "podarray.h",
>> the second is explicitly included in collate.cpp).
>>
>> For successful compiling I added #ifndef #define #endif guard to the
>> file podarray.cpp,
>> but I think should be another solution to resolve this problem.
>
>
> You're right. I've been testing a patch for this. If all
> goes well I'll commit it tomorrow. Sorry about the breakage!
This should fix it. Tested with gcc and icc on Linux:
http://svn.apache.org/viewvc?rev=433116&view=rev
Let me know if there are any remaining MSVC problems.
Martin
|