szaszm commented on a change in pull request #870:
URL: https://github.com/apache/nifi-minifi-cpp/pull/870#discussion_r475798626
##########
File path: extensions/libarchive/MergeContent.h
##########
@@ -32,17 +32,21 @@ namespace nifi {
namespace minifi {
namespace processors {
-#define MERGE_STRATEGY_BIN_PACK "Bin-Packing Algorithm"
-#define MERGE_STRATEGY_DEFRAGMENT "Defragment"
-#define MERGE_FORMAT_TAR_VALUE "TAR"
-#define MERGE_FORMAT_ZIP_VALUE "ZIP"
-#define MERGE_FORMAT_FLOWFILE_STREAM_V3_VALUE "FlowFile Stream, v3"
-#define MERGE_FORMAT_FLOWFILE_STREAM_V2_VALUE "FlowFile Stream, v2"
-#define MERGE_FORMAT_FLOWFILE_TAR_V1_VALUE "FlowFile Tar, v1"
-#define MERGE_FORMAT_CONCAT_VALUE "Binary Concatenation"
-#define MERGE_FORMAT_AVRO_VALUE "Avro"
-#define DELIMITER_STRATEGY_FILENAME "Filename"
-#define DELIMITER_STRATEGY_TEXT "Text"
+namespace MergeContentOptions {
+constexpr const char *MERGE_STRATEGY_BIN_PACK = "Bin-Packing Algorithm";
+constexpr const char *MERGE_STRATEGY_DEFRAGMENT = "Defragment";
+constexpr const char *MERGE_FORMAT_TAR_VALUE = "TAR";
+constexpr const char *MERGE_FORMAT_ZIP_VALUE = "ZIP";
+constexpr const char *MERGE_FORMAT_FLOWFILE_STREAM_V3_VALUE = "FlowFile
Stream, v3";
+constexpr const char *MERGE_FORMAT_FLOWFILE_STREAM_V2_VALUE = "FlowFile
Stream, v2";
+constexpr const char *MERGE_FORMAT_FLOWFILE_TAR_V1_VALUE = "FlowFile Tar, v1";
+constexpr const char *MERGE_FORMAT_CONCAT_VALUE = "Binary Concatenation";
+constexpr const char *MERGE_FORMAT_AVRO_VALUE = "Avro";
+constexpr const char *DELIMITER_STRATEGY_FILENAME = "Filename";
+constexpr const char *DELIMITER_STRATEGY_TEXT = "Text";
+constexpr const char *ATTRIBUTE_STRATEGY_KEEP_COMMON = "Keep Only Common
Attributes";
+constexpr const char *ATTRIBUTE_STRATEGY_KEEP_ALL_UNIQUE = "Keep All Unique
Attributes";
+}
Review comment:
https://google.github.io/styleguide/cppguide.html#Namespaces
https://google.github.io/styleguide/cppguide.html#Vertical_Whitespace
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
