Skip to content

Commit 93bca2b

Browse files
committed
Fix conflicts
Signed-off-by: Miguel Company <[email protected]>
1 parent 6847a13 commit 93bca2b

File tree

1 file changed

+1
-68
lines changed

1 file changed

+1
-68
lines changed

src/main/java/com/eprosima/fastdds/fastddsgen.java

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -580,51 +580,10 @@ private boolean isIncludePathDuplicated(String pathToCheck)
580580
{
581581
// path operations failed, just returning false
582582
}
583-
<<<<<<< HEAD
584-
585-
return false;
586-
}
587-
=======
583+
588584
return false;
589585
}
590586

591-
/*
592-
* ----------------------------------------------------------------------------------------
593-
* Arguments
594-
*/
595-
private static final String case_sensitive_arg = "-cs";
596-
private static final String output_path_arg = "-d";
597-
private static final String default_container_prealloc_size = "-default-container-prealloc-size";
598-
private static final String default_extensibility_arg = "-default_extensibility";
599-
private static final String default_extensibility_short_arg = "-de";
600-
private static final String specific_platform_arg = "-example";
601-
private static final String extra_template_arg = "-extrastg";
602-
private static final String flat_output_directory_arg = "-flat-output-dir";
603-
private static final String fusion_arg = "-fusion";
604-
private static final String help_arg = "-help";
605-
private static final String include_path_arg = "-I";
606-
private static final String language_arg = "-language";
607-
private static final String no_typesupport_arg = "-no-typesupport";
608-
private static final String no_typeobjectsupport_arg = "-no-typeobjectsupport";
609-
private static final String no_dependencies_arg = "-no-dependencies";
610-
private static final String package_arg = "-package";
611-
private static final String disable_preprocessor_arg = "-ppDisable";
612-
private static final String preprocessor_path_arg = "-ppPath";
613-
private static final String python_bindings_arg = "-python";
614-
private static final String replace_arg = "-replace";
615-
private static final String temp_dir_arg = "-t";
616-
private static final String ros2_names_arg = "-typeros2";
617-
private static final String cnames_arg = "-typesc";
618-
private static final String version_arg = "-version";
619-
620-
/*
621-
* ----------------------------------------------------------------------------------------
622-
* Developer Arguments
623-
*/
624-
private static final String generate_api_arg = "-genapi";
625-
private static final String execute_test_arg = "-test";
626-
>>>>>>> fbb0672 (Apply user template to included IDL files (#472) (#474))
627-
628587
public static void printHelp()
629588
{
630589
System.out.println(m_appName + " usage:");
@@ -824,11 +783,6 @@ private Project parseIDL(
824783
for (Map.Entry<String, String> entry : m_customStgOutput.entrySet())
825784
{
826785
System.out.println("Loading custom template " + entry.getKey() + "...");
827-
<<<<<<< HEAD
828-
Path path = Paths.get(entry.getKey());
829-
String templateName = path.getFileName().toString().substring(0, path.getFileName().toString().lastIndexOf('.'));
830-
tmanager.addGroup(templateName);
831-
=======
832786
loadAndAddTemplate(entry.getKey(), tmanager);
833787
}
834788
}
@@ -843,7 +797,6 @@ private Project parseIDL(
843797
entry.getKey() + " for included IDL file " + idlFilename + "...");
844798
loadAndAddTemplate(entry.getKey(), tmanager);
845799
}
846-
>>>>>>> fbb0672 (Apply user template to included IDL files (#472) (#474))
847800
}
848801
}
849802

@@ -886,29 +839,9 @@ >>>>>>> fbb0672 (Apply user template to included IDL files (#472) (#474))
886839
{
887840
for (Map.Entry<String, String> entry : m_customStgOutput.entrySet())
888841
{
889-
<<<<<<< HEAD
890-
Path path = Paths.get(entry.getKey());
891-
String templateName = path.getFileName().toString().substring(0, path.getFileName().toString().lastIndexOf('.'));
892-
System.out.println("Generating from custom " + templateName + " to " + entry.getValue());
893-
894-
if (returnedValue = Utils.writeFile(m_outputDir + entry.getValue(), maintemplates.getTemplate(templateName), m_replace))
895-
{
896-
// Try to determine if the file is a header file.
897-
if (entry.getValue().contains(".hpp") || entry.getValue().contains(".h"))
898-
{
899-
project.addCommonIncludeFile(entry.getValue());
900-
}
901-
else
902-
{
903-
project.addCommonSrcFile(ctx.getFilename() + entry.getValue());
904-
}
905-
}
906-
else
907-
=======
908842
if (! (returnedValue = createOutputCustomTemplate(
909843
entry, idlFilename, output_dir, relative_dir, ctx.getFilename(),
910844
maintemplates, m_replace, project)))
911-
>>>>>>> fbb0672 (Apply user template to included IDL files (#472) (#474))
912845
{
913846
break;
914847
}

0 commit comments

Comments
 (0)