diff options
author | Hugo Parente Lima <hugo.lima@openbossa.org> | 2010-06-11 16:11:32 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-09 19:10:05 -0300 |
commit | bb81e23761fdff05f2becaa90839ae3384c28fd5 (patch) | |
tree | be38d92a5f5e1f67bb8fe5466cae57dc12f96286 | |
parent | b23a67365cfa2e93f71aea81feeca51c08b4f24e (diff) |
Fix compilation and instalation on MSVC.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r-- | ApiExtractorConfig.cmake.in | 6 | ||||
-rw-r--r-- | parser/rpp/pp-iterator.h | 6 |
2 files changed, 11 insertions, 1 deletions
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); |