Skip to content

Commit 8512e27

Browse files
committed
fixed userdoc simulation.xml example AggregationScenarioDataCurrencies and AggregationScenarioDataIndices.
fixed incosistency of boost library (1_78 everywhere now) in userdoc fixed ABI problem in analytics test by adding PUBLIC BOOST_USE_WINAPI_VERSION=0x0600
1 parent a3285fb commit 8512e27

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

Docs/UserGuide/userguide.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@ \subsubsection*{Windows}
661661

662662
Set environment variables, e.g.:
663663
\begin{itemize}
664-
\item {\tt \%BOOST\%} pointing to your directory, e.g, {\tt C:{\bs}boost\_1\_72\_0}
665-
\item {\tt \%BOOST\_LIB32\%} pointing to your Win32 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib32\-msvc\-14.2}
666-
\item {\tt \%BOOST\_LIB64\%} pointing to your x64 lib directory, e.g, {\tt C:{\bs}boost\_1\_72\_0{\bs}lib64\-msvc\-14.2}
664+
\item {\tt \%BOOST\%} pointing to your directory, e.g, {\tt C:{\bs}boost\_1\_78\_0}
665+
\item {\tt \%BOOST\_LIB32\%} pointing to your Win32 lib directory, e.g, {\tt C:{\bs}boost\_1\_78\_0{\bs}lib32\-msvc\-14.2}
666+
\item {\tt \%BOOST\_LIB64\%} pointing to your x64 lib directory, e.g, {\tt C:{\bs}boost\_1\_78\_0{\bs}lib64\-msvc\-14.2}
667667
\end{itemize}
668668

669669
\item Download and install CMake for Windows (https://cmake.org/download/). Visual Studio Community Edition 2019 or later supports CMake and you can install the feature 'C++ CMake Tools for Windows' instead of installing CMake as standalone program.
@@ -5871,15 +5871,15 @@ \subsubsection{Market}\label{sec:sim_market}
58715871
</Pairs>
58725872
<Expiries>1Y,2Y</Expiries>
58735873
</Correlations>
5874-
<AdditionalScenarioDataCurrencies>
5874+
<AggregationScenarioDataCurrencies>
58755875
<Currency>EUR</Currency>
58765876
<Currency>USD</Currency>
5877-
</AdditionalScenarioDataCurrencies>
5878-
<AdditionalScenarioDataIndices>
5877+
</AggregationScenarioDataCurrencies>
5878+
<AggregationScenarioDataIndices>
58795879
<Index>EUR-EURIBOR-3M</Index>
58805880
<Index>EUR-EONIA</Index>
58815881
<Index>USD-LIBOR-3M</Index>
5882-
</AdditionalScenarioDataIndices>
5882+
</AggregationScenarioDataIndices>
58835883
</Market>
58845884
\end{minted}
58855885
\caption{Simulation market configuration}

OREAnalytics/test/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ target_link_libraries(orea-test-suite ${ORED_LIB_NAME})
3232
target_link_libraries(orea-test-suite ${OREA_LIB_NAME})
3333
target_link_libraries(orea-test-suite ${Boost_LIBRARIES} ${RT_LIBRARY})
3434

35+
# avoid ABI mismatch between precompiled boost.log and this compiler run...
36+
target_compile_definitions(orea-test-suite PUBLIC BOOST_USE_WINAPI_VERSION=0x0600)
37+
3538
add_test(NAME orea-test-suite WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} COMMAND orea-test-suite -- --base_data_path=.)
3639

3740
install(TARGETS orea-test-suite

0 commit comments

Comments
 (0)