From bb81e23761fdff05f2becaa90839ae3384c28fd5 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Fri, 11 Jun 2010 16:11:32 -0300 Subject: Fix compilation and instalation on MSVC. Reviewer: Marcelo Lira Luciano Wolf --- ApiExtractorConfig.cmake.in | 6 +++++- parser/rpp/pp-iterator.h | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ApiExtractorConfig.cmake.in b/ApiExtractorConfig.cmake.in index 3faf366bb..6c4001fff 100644 --- a/ApiExtractorConfig.cmake.in +++ b/ApiExtractorConfig.cmake.in @@ -3,4 +3,8 @@ # APIEXTRACTOR_LIBRARIES - Files to link against to use APIEXTRACTOR SET(APIEXTRACTOR_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/apiextractor") -SET(APIEXTRACTOR_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@apiextractor@CMAKE_SHARED_LIBRARY_SUFFIX@") +if(MSVC) + SET(APIEXTRACTOR_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@apiextractor.lib") +else() + SET(APIEXTRACTOR_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@apiextractor@CMAKE_SHARED_LIBRARY_SUFFIX@") +endif() \ No newline at end of file diff --git a/parser/rpp/pp-iterator.h b/parser/rpp/pp-iterator.h index fe846bd26..3e87d1cfc 100644 --- a/parser/rpp/pp-iterator.h +++ b/parser/rpp/pp-iterator.h @@ -62,6 +62,12 @@ public: explicit pp_output_iterator(std::string &__result): _M_result(__result) {} + inline pp_output_iterator<_Container>& operator=(const pp_output_iterator<_Container>& other) + { + _M_result = other._M_result; + return *this; + } + inline pp_output_iterator &operator=(typename _Container::const_reference __v) { if (_M_result.capacity() == _M_result.size()) _M_result.reserve(_M_result.capacity() << 2); -- cgit v1.2.3