Skip to content

Commit 0e564fb

Browse files
Sebastien Bouvardjenkins
authored andcommitted
QPR-12223 Fx merge conflict
2 parents 319a0e6 + 53172fe commit 0e564fb

148 files changed

Lines changed: 36080 additions & 4836 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

App/ore.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include <orea/app/oreapp.hpp>
2929

30-
#include <ored/utilities/initbuilders.hpp>
30+
#include <orea/app/initbuilders.hpp>
3131

3232
#include <qle/version.hpp>
3333

@@ -71,7 +71,7 @@ int main(int argc, char** argv) {
7171
return -1;
7272
}
7373

74-
ore::data::initBuilders();
74+
ore::analytics::initBuilders();
7575

7676
string inputFile(argv[1]);
7777

Docs/Design/data/notebook.pdf

236 KB
Binary file not shown.

Docs/Design/data/process.pdf

35.2 KB
Binary file not shown.

Docs/Design/data/restore.pdf

17.4 KB
Binary file not shown.

Docs/Design/data/restore.pptx

39.5 KB
Binary file not shown.

Docs/Design/data/services.pdf

37.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)