Skip to content

Commit

Permalink
Refs #21349. Rename GEN_API_VER
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
  • Loading branch information
richiware committed Jul 12, 2024
1 parent 61d85de commit 98a4418
Show file tree
Hide file tree
Showing 61 changed files with 121 additions and 121 deletions.
4 changes: 2 additions & 2 deletions examples/cpp/configuration/ConfigurationPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "Configuration.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated Configuration is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/content_filter/HelloWorldPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "FlowControlExample.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated FlowControlExample is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/dds/Keys/samplePubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "sample.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated sample is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "Calculator.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated Calculator is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "LoanableHelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated LoanableHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


#ifndef SWIG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "LoanableHelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated LoanableHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


#ifndef SWIG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "DeliveryMechanisms.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated DeliveryMechanisms is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


#ifndef SWIG
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/discovery_server/HelloWorldPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/hello_world/HelloWorldPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
2 changes: 1 addition & 1 deletion include/fastdds/config.hpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define FASTDDS_VERSION_MICRO @PROJECT_VERSION_PATCH@
#define FASTDDS_VERSION_STR "@PROJECT_VERSION@"

#define GEN_API_VER 2
#define FASTDDS_GEN_API_VER 3

// C++20 support defines
#ifndef HAVE_CXX20
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "dds_xtypes_typeobject.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated dds_xtypes_typeobject is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER

namespace eprosima {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
#include <fastdds/dds/core/ReturnCode.hpp>
#include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>

#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated TypeLookupTypes is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER

namespace eprosima {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "rpc_types.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated rpc_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER

namespace eprosima {

Expand Down
4 changes: 2 additions & 2 deletions src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@

#include "typesPubSubTypes.hpp"

#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated monitorservice_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER

namespace eprosima
{
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/statistics/types/typesPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "types.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER

namespace eprosima
{
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/Data1mbPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "Data1mb.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated Data1mb is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/Data64kbPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "Data64kb.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated Data64kb is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/FixedSizedPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "FixedSized.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated FixedSized is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


#ifndef SWIG
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/HelloWorldPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "HelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/KeyedData1mbPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "KeyedData1mb.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated KeyedData1mb is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "KeyedHelloWorld.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated KeyedHelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/StringTestPubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "StringTest.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated StringTest is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
#include "TestIncludeRegression3361.hpp"


#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated TestIncludeRegression3361 is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER

namespace TestModule
{
Expand Down
4 changes: 2 additions & 2 deletions test/blackbox/types/TestRegression3361PubSubTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@

#include "TestIncludeRegression3361PubSubTypes.hpp"

#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
#if !defined(FASTDDS_GEN_API_VER) || (FASTDDS_GEN_API_VER != 3)
#error \
Generated TestRegression3361 is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
#endif // GEN_API_VER
#endif // FASTDDS_GEN_API_VER


/*!
Expand Down
Loading

0 comments on commit 98a4418

Please sign in to comment.