ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

NOTICK - fix cpp serialiser under linux (#5801)

Browse Source
This commit is contained in:
Katelyn Baker 2019-12-11 10:35:45 +00:00 committed by bpaunescu
parent ce4bbfc422
commit 0d7c10a846
6 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
experimental/cpp-serializer/CMakeLists.txt
View File

@ -6,15 +6,14 @@ SET (${PROJECT_NAME}_MAJOR_VERSION 0)
SET (${PROJECT_NAME}_MINOR_VERSION 0) SET (${PROJECT_NAME}_MINOR_VERSION 0)
SET (${PROJECT_NAME}_PATCH_LEVEL 1) SET (${PROJECT_NAME}_PATCH_LEVEL 1)
#ADD_DEFINITIONS ("-Wall -g -ansi -pedantic") ADD_DEFINITIONS ("-Wall -g -ansi -pedantic")
ADD_DEFINITIONS ("-Wall -g -ansi")
#ADD_DEFINITIONS ("-DSRC_DEBUG") #ADD_DEFINITIONS ("-DSRC_DEBUG")
# #
# #
# #
set (CMAKE_VERBOSE_MAKEFILE "FALSE" CACHE BOOL "" FORCE) #set (CMAKE_VERBOSE_MAKEFILE "TRUE" CACHE BOOL "" FORCE)
# #
# For "reasons" something to do with the way the comand line compiler # For "reasons" something to do with the way the comand line compiler
@ -32,7 +31,9 @@ endif()
# #
include_directories (${BLOB-INSPECTOR_SOURCE_DIR}/include) include_directories (${BLOB-INSPECTOR_SOURCE_DIR}/include)
add_compile_options(-std=c++17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
ADD_SUBDIRECTORY (src) ADD_SUBDIRECTORY (src)
ADD_SUBDIRECTORY (bin) ADD_SUBDIRECTORY (bin)

9
experimental/cpp-serializer/README.md
View File

@ -36,8 +36,13 @@ Google Test
* make * make
* make install * make install
### Linux ### Linux (Ubuntu)
* sudo apt-get install cmake * sudo apt-get install cmake
* sudo apt-get install libqpid-proton8-dev * sudo apt-get install libqpid-proton8-dev
* sudi apt-get install libgtest-dev * sudo apt-get install libgtest-dev
And now because that installer only pulls down the sources
* cd /usr/src/googletest
* sudo cmake .
* sudo cmake --build . --target install

2
experimental/cpp-serializer/bin/schema-dumper/CMakeLists.txt
View File

@ -6,4 +6,4 @@ link_directories (${BLOB-INSPECTOR_BINARY_DIR}/src/proton)
add_executable (schema-dumper main) add_executable (schema-dumper main)
target_link_libraries (schema-dumper proton amqp qpid-proton) target_link_libraries (schema-dumper amqp proton qpid-proton)

1
experimental/cpp-serializer/src/amqp/CompositeFactory.h
View File

@ -4,6 +4,7 @@
#include <map> #include <map>
#include <set> #include <set>
#include <memory>
#include "types.h" #include "types.h"

1
experimental/cpp-serializer/src/amqp/descriptors/AMQPDescriptor.h
View File

@ -3,6 +3,7 @@
/******************************************************************************/ /******************************************************************************/
#include <map> #include <map>
#include <memory>
#include <string> #include <string>
#include <iostream> #include <iostream>

31
experimental/cpp-serializer/src/amqp/test/OrderedTypeNotationTest.cxx
View File

@ -45,17 +45,14 @@ namespace {
const std::string & name() const { return m_name; } const std::string & name() const { return m_name; }
decltype(m_dependsOn.cbegin()) begin() const { return m_dependsOn.cbegin(); } decltype(m_dependsOn.cbegin()) begin() const {
decltype(m_dependsOn.cend()) end() const { return m_dependsOn.cend(); } return m_dependsOn.cbegin();
}; }
inline decltype(m_dependsOn.cend()) end() const {
std::string return m_dependsOn.cend();
str (const amqp::internal::schema::OrderedTypeNotations<OTN> & list_) { }
std::stringstream ss; };
ss << list_;
return ss.str();
}
} }
@ -88,6 +85,20 @@ operator << (
/******************************************************************************/ /******************************************************************************/
namespace {
inline
std::string
str (const amqp::internal::schema::OrderedTypeNotations<OTN> & list_) {
std::stringstream ss;
ss << list_;
return ss.str();
}
}
/******************************************************************************/
TEST (OTNTest, singleInsert) { // NOLINT TEST (OTNTest, singleInsert) { // NOLINT
amqp::internal::schema::OrderedTypeNotations<OTN> list; amqp::internal::schema::OrderedTypeNotations<OTN> list;