Commit df4232d9 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Created branch with some changes for Rocky Linux 9. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent f560fece

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ INC_DIR=/usr/local/omniORB/include \ 
	   /usr/local/boost/include \

	   /usr/local/soci/include \

	   /usr/local/soci/include/soci \

	   /usr/include/mariadb \

	   /usr/include/mysql \

	   /usr/include/soci \

	   /usr/local/protobuf/include \

	   ./src
@@ -29,7 +29,7 @@ CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG 
CXX_RELEASE_FLAGS=-O3

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x -Wno-unused-local-typedefs -DHAVE_BOOST -DBOOST_BIND_GLOBAL_PLACEHOLDERS

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

	-lsoci_core -lsoci_mysql -lmariadbclient -lboost_system -lboost_thread \

	-lsoci_core -lsoci_mysql -lmariadb -lboost_system -lboost_thread \

	-lboost_filesystem -lboost_date_time -lprotobuf -lssl -lcrypto -lpthread

INC_NO_WARNINGS=-isystem /usr/local/tango/include/tango

INC_PARM=$(foreach d, $(INC_DIR), -I$d) $(INC_NO_WARNINGS)

src/Request.pb.cc

+10 −35
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ static void InitDefaultsscc_info_Request_Request_2eproto() { 
    new (ptr) ::MetadataImporter_ns::Request();

    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);

  }

  ::MetadataImporter_ns::Request::InitAsDefaultInstance();

}



::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<3> scc_info_Request_Request_2eproto =
@@ -65,7 +64,6 @@ static void InitDefaultsscc_info_Request_Authorization_Request_2eproto() { 
    new (ptr) ::MetadataImporter_ns::Request_Authorization();

    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);

  }

  ::MetadataImporter_ns::Request_Authorization::InitAsDefaultInstance();

}



::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Request_Authorization_Request_2eproto =
@@ -79,7 +77,6 @@ static void InitDefaultsscc_info_Request_Metadata_Request_2eproto() { 
    new (ptr) ::MetadataImporter_ns::Request_Metadata();

    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);

  }

  ::MetadataImporter_ns::Request_Metadata::InitAsDefaultInstance();

}



::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Request_Metadata_Request_2eproto =
@@ -93,7 +90,6 @@ static void InitDefaultsscc_info_Request_Validation_Request_2eproto() { 
    new (ptr) ::MetadataImporter_ns::Request_Validation();

    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);

  }

  ::MetadataImporter_ns::Request_Validation::InitAsDefaultInstance();

}



::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_Request_Validation_Request_2eproto =
@@ -108,7 +104,6 @@ static void InitDefaultsscc_info_Request_Validation_Column_Request_2eproto() { 
    new (ptr) ::MetadataImporter_ns::Request_Validation_Column();

    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);

  }

  ::MetadataImporter_ns::Request_Validation_Column::InitAsDefaultInstance();

}



::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Request_Validation_Column_Request_2eproto =
@@ -250,8 +245,6 @@ constexpr int Request::Type_ARRAYSIZE; 


// ===================================================================



void Request_Authorization::InitAsDefaultInstance() {

}

class Request_Authorization::_Internal {

 public:

  using HasBits = decltype(std::declval<Request_Authorization>()._has_bits_);
@@ -278,12 +271,12 @@ Request_Authorization::Request_Authorization(const Request_Authorization& from) 
  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);

  username_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());

  if (from._internal_has_username()) {

    username_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_username(),

    username_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_username(), 

      GetArena());

  }

  password_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());

  if (from._internal_has_password()) {

    password_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_password(),

    password_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_password(), 

      GetArena());

  }

  // @@protoc_insertion_point(copy_constructor:MetadataImporter_ns.Request.Authorization)
@@ -344,7 +337,6 @@ void Request_Authorization::Clear() { 
const char* Request_Authorization::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {

#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure

  _Internal::HasBits has_bits{};

  ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;

  while (!ctx->Done(&ptr)) {

    ::PROTOBUF_NAMESPACE_ID::uint32 tag;

    ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
@@ -548,8 +540,6 @@ void Request_Authorization::InternalSwap(Request_Authorization* other) { 


// ===================================================================



void Request_Validation_Column::InitAsDefaultInstance() {

}

class Request_Validation_Column::_Internal {

 public:

  using HasBits = decltype(std::declval<Request_Validation_Column>()._has_bits_);
@@ -579,17 +569,17 @@ Request_Validation_Column::Request_Validation_Column(const Request_Validation_Co 
  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);

  name_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());

  if (from._internal_has_name()) {

    name_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_name(),

    name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_name(), 

      GetArena());

  }

  type_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());

  if (from._internal_has_type()) {

    type_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_type(),

    type_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_type(), 

      GetArena());

  }

  nullable_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());

  if (from._internal_has_nullable()) {

    nullable_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_nullable(),

    nullable_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_nullable(), 

      GetArena());

  }

  // @@protoc_insertion_point(copy_constructor:MetadataImporter_ns.Request.Validation.Column)
@@ -655,7 +645,6 @@ void Request_Validation_Column::Clear() { 
const char* Request_Validation_Column::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {

#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure

  _Internal::HasBits has_bits{};

  ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;

  while (!ctx->Done(&ptr)) {

    ::PROTOBUF_NAMESPACE_ID::uint32 tag;

    ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
@@ -896,8 +885,6 @@ void Request_Validation_Column::InternalSwap(Request_Validation_Column* other) { 


// ===================================================================



void Request_Validation::InitAsDefaultInstance() {

}

class Request_Validation::_Internal {

 public:

  using HasBits = decltype(std::declval<Request_Validation>()._has_bits_);
@@ -926,12 +913,12 @@ Request_Validation::Request_Validation(const Request_Validation& from) 
  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);

  schema_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());

  if (from._internal_has_schema()) {

    schema_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_schema(),

    schema_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_schema(), 

      GetArena());

  }

  table_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());

  if (from._internal_has_table()) {

    table_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_table(),

    table_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, from._internal_table(), 

      GetArena());

  }

  // @@protoc_insertion_point(copy_constructor:MetadataImporter_ns.Request.Validation)
@@ -993,7 +980,6 @@ void Request_Validation::Clear() { 
const char* Request_Validation::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {

#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure

  _Internal::HasBits has_bits{};

  ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;

  while (!ctx->Done(&ptr)) {

    ::PROTOBUF_NAMESPACE_ID::uint32 tag;

    ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
@@ -1227,8 +1213,6 @@ void Request_Validation::InternalSwap(Request_Validation* other) { 


// ===================================================================



void Request_Metadata::InitAsDefaultInstance() {

}

class Request_Metadata::_Internal {

 public:

  using HasBits = decltype(std::declval<Request_Metadata>()._has_bits_);
@@ -1297,7 +1281,6 @@ void Request_Metadata::Clear() { 
const char* Request_Metadata::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {

#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure

  _Internal::HasBits has_bits{};

  ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;

  while (!ctx->Done(&ptr)) {

    ::PROTOBUF_NAMESPACE_ID::uint32 tag;

    ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
@@ -1436,14 +1419,6 @@ void Request_Metadata::InternalSwap(Request_Metadata* other) { 


// ===================================================================



void Request::InitAsDefaultInstance() {

  ::MetadataImporter_ns::_Request_default_instance_._instance.get_mutable()->authorization_ = const_cast< ::MetadataImporter_ns::Request_Authorization*>(

      ::MetadataImporter_ns::Request_Authorization::internal_default_instance());

  ::MetadataImporter_ns::_Request_default_instance_._instance.get_mutable()->validation_ = const_cast< ::MetadataImporter_ns::Request_Validation*>(

      ::MetadataImporter_ns::Request_Validation::internal_default_instance());

  ::MetadataImporter_ns::_Request_default_instance_._instance.get_mutable()->metadata_ = const_cast< ::MetadataImporter_ns::Request_Metadata*>(

      ::MetadataImporter_ns::Request_Metadata::internal_default_instance());

}

class Request::_Internal {

 public:

  using HasBits = decltype(std::declval<Request>()._has_bits_);
@@ -1510,8 +1485,9 @@ Request::Request(const Request& from) 


void Request::SharedCtor() {

  ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_Request_Request_2eproto.base);

  ::memset(&authorization_, 0, static_cast<size_t>(

      reinterpret_cast<char*>(&type_) -

  ::memset(reinterpret_cast<char*>(this) + static_cast<size_t>(

      reinterpret_cast<char*>(&authorization_) - reinterpret_cast<char*>(this)),

      0, static_cast<size_t>(reinterpret_cast<char*>(&type_) -

      reinterpret_cast<char*>(&authorization_)) + sizeof(type_));

}
@@ -1572,7 +1548,6 @@ void Request::Clear() { 
const char* Request::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {

#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure

  _Internal::HasBits has_bits{};

  ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;

  while (!ctx->Done(&ptr)) {

    ::PROTOBUF_NAMESPACE_ID::uint32 tag;

    ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);

src/Request.pb.h

+67 −270

File changed.

Preview size limit exceeded, changes collapsed.

src/Response.pb.cc

+13 −62

File changed.

Preview size limit exceeded, changes collapsed.

src/Response.pb.h

+97 −393

File changed.

Preview size limit exceeded, changes collapsed.