Skip to content

use proper RapidJSON API in qcnl #453

@olafhering

Description

@olafhering

According to the way RapidJSON is used elsewhere in the repository (at e880e54), and how it is documented at rapidjson.org, the intended API appears to be:

#include <rapidjson/*.h>

I think this change is required, and the additional RapidJSON related include need to be adjusted in the Makefile:

--- a/QuoteGeneration/qcnl/certification_provider.cpp
+++ b/QuoteGeneration/qcnl/certification_provider.cpp
@@ -36,7 +36,7 @@
  */
 #include "certification_provider.h"
 #include "certification_service.h"
-#include "document.h"
+#include <rapidjson/document.h>
 #include "local_cache.h"
 #include "pck_cert_selection.h"
 #include "qcnl_util.h"
--- a/QuoteGeneration/qcnl/inc/pccs_response_object.h
+++ b/QuoteGeneration/qcnl/inc/pccs_response_object.h
@@ -37,7 +37,7 @@
 #define PCCSRESPONSEOBJECT_H_
 #pragma once
 
-#include "document.h"
+#include <rapidjson/document.h>
 #include "qcnl_def.h"
 #include <sstream>
 #include <string>
--- a/QuoteGeneration/qcnl/inc/qcnl_config.h
+++ b/QuoteGeneration/qcnl/inc/qcnl_config.h
@@ -38,7 +38,7 @@
 #pragma once
 
 #include "sgx_default_qcnl_wrapper.h"
-#include "document.h"
+#include <rapidjson/document.h>
 #include <memory>
 #include <string>
 
--- a/QuoteGeneration/qcnl/linux/qcnl_config_impl.cpp
+++ b/QuoteGeneration/qcnl/linux/qcnl_config_impl.cpp
@@ -35,7 +35,7 @@
  *
  */
 
-#include "istreamwrapper.h"
+#include <rapidjson/istreamwrapper.h>
 #include "qcnl_config.h"
 #include <algorithm>
 #include <curl/curl.h>
--- a/QuoteGeneration/qcnl/qcnl_config.cpp
+++ b/QuoteGeneration/qcnl/qcnl_config.cpp
@@ -36,10 +36,10 @@
  */
 
 #include "qcnl_config.h"
-#include "error/en.h"
-#include "error/error.h"
+#include <rapidjson/error/en.h>
+#include <rapidjson/error/error.h>
+#include <rapidjson/istreamwrapper.h>
 #include <fstream>
-#include <istreamwrapper.h>
 #include <mutex>
 #include <algorithm>
 

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions