genie generated code now requires c++11 support

Signed-off-by: Tom Flynn <tom.flynn@gmail.com>
noironetworks · Jun 25, 2020 · c17bfee · c17bfee
1 parent 00242d8
commit c17bfee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...a/org/opendaylight/opflex/genie/content/format/agent/build/automake/cpp/FConfigureAC.java b/...a/org/opendaylight/opflex/genie/content/format/agent/build/automake/cpp/FConfigureAC.java
@@ -83,13 +83,13 @@ public void generate()
                                         + "# Environment introspection\n" + "\n" + "# check for compiler\n"
                                         + "AC_PROG_CC\n" + "AC_PROG_CXX\n" + "AC_PROG_INSTALL\n" + "AM_PROG_AS\n"
                                         + "AC_LANG([C++])\n" + "\n" + "# check for doxygen\n"
-                                        + "AX_CXX_COMPILE_STDCXX([11], [noext], [optional])\n"
+                                        + "AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])\n"
                                         + "AC_CHECK_PROGS(DOXYGEN,doxygen,none)\n"
                                         + "AM_CONDITIONAL(HAVE_DOXYGEN, [test x$DOXYGEN != 'xnone']) \n" + "\n"
                                         + "# ---------------------------------------------------------------\n"
                                         + "# Dependency checks\n" + "\n" + "# Checks for header files\n"
                                         + "AC_STDC_HEADERS\n" + "\n"
-                                        + "AX_BOOST_BASE([1.49.0], [], AC_MSG_ERROR([Boost is required]))\n"
+                                        + "AX_BOOST_BASE([1.53.0], [], AC_MSG_ERROR([Boost is required]))\n"
                                         + "PKG_CHECK_MODULES([libopflex], [libopflex >= 2.2.0])\n" + "\n"
                                         + "# Older versions of autoconf don't define docdir\n"
                                         + "if test x$docdir = x; then\n"

diff --git a/...main/java/org/opendaylight/opflex/genie/content/format/agent/structure/cpp/FClassDef.java b/...main/java/org/opendaylight/opflex/genie/content/format/agent/structure/cpp/FClassDef.java
@@ -643,7 +643,7 @@ private void genRootCreation(int aInIdent, MClass aInClass)
             "@see opflex::modb::Mutator"));
         out.printHeaderComment(aInIdent,lComment);
 
-        out.println(aInIdent, "static OF_SHARED_PTR<" + lClassName + "> createRootElement(opflex::ofcore::OFFramework& framework)");
+        out.println(aInIdent, "static std::shared_ptr<" + lClassName + "> createRootElement(opflex::ofcore::OFFramework& framework)");
         out.println(aInIdent,"{");
         out.println(aInIdent + 1, "return opflex::modb::mointernal::MO::createRootElement<" + lClassName + ">(framework, CLASS_ID);");
         out.println(aInIdent, "}");
@@ -677,7 +677,7 @@ private void genSelfResolvers(int aInIdent, MClass aInClass)
              "does not exist."};
         out.printHeaderComment(aInIdent,lComment);
 
-        out.println(aInIdent, "static boost::optional<OF_SHARED_PTR<" + lFullyQualifiedClassName + "> > resolve(");
+        out.println(aInIdent, "static boost::optional<std::shared_ptr<" + lFullyQualifiedClassName + "> > resolve(");
         out.println(aInIdent + 1, "opflex::ofcore::OFFramework& framework,");
         out.println(aInIdent + 1, "const opflex::modb::URI& uri)");
         out.println(aInIdent, "{");
@@ -1037,7 +1037,7 @@ private void genNamedSelfResolvers(int aInIdent, MClass aInClass, List<Pair<Stri
         comment.add("does not exist.");
         out.printHeaderComment(aInIdent,comment);
 
-        out.println(aInIdent,"static boost::optional<OF_SHARED_PTR<" + getClassName(aInClass,true)+ "> > " + lMethodName + "(");
+        out.println(aInIdent,"static boost::optional<std::shared_ptr<" + getClassName(aInClass,true)+ "> > " + lMethodName + "(");
         out.print(aInIdent + 1, "opflex::ofcore::OFFramework& framework");
         for (Pair<String,MNameRule> lNamingNode : aInNamingPath)
         {
@@ -1092,7 +1092,7 @@ private void genChildAdder(int aInIdent, MClass aInParentClass, MClass aInChildC
         {
             lMethodName += lTargetClassName;
         }
-        out.println(aInIdent, "OF_SHARED_PTR<" +  aInFormattedChildClassName + "> " + lMethodName + "(");
+        out.println(aInIdent, "std::shared_ptr<" +  aInFormattedChildClassName + "> " + lMethodName + "(");
 
         boolean lIsFirst = true;
         MNameComponent lClassProp = null;
@@ -1132,7 +1132,7 @@ private void genChildAdder(int aInIdent, MClass aInParentClass, MClass aInChildC
         {
             out.println(aInIdent + 1, "static const opflex::modb::class_id_t " + getPropParamName(aInChildClass, lClassProp.getPropName()) + " = " + aInTargetClass.getGID().getId() + ";");
         }
-        out.println(aInIdent + 1, "OF_SHARED_PTR<" + aInFormattedChildClassName + "> result = addChild<" + aInFormattedChildClassName+ ">(");
+        out.println(aInIdent + 1, "std::shared_ptr<" + aInFormattedChildClassName + "> result = addChild<" + aInFormattedChildClassName+ ">(");
         out.println(aInIdent + 2, "CLASS_ID, getURI(), " + toUnsignedStr(aInChildClass.getClassAsPropId(aInParentClass)) + ", " + aInChildClass.getGID().getId() + ",");
         out.println(aInIdent + 2, aInUriBuilder);
         out.println(aInIdent + 2, ");");
@@ -1196,7 +1196,7 @@ private void genChildResolver(
             lMethodName += lTargetClassName;
         }
 
-        out.println(aInIdent, "boost::optional<OF_SHARED_PTR<" +  aInFormattedChildClassName + "> > " + lMethodName + "(");
+        out.println(aInIdent, "boost::optional<std::shared_ptr<" +  aInFormattedChildClassName + "> > " + lMethodName + "(");
 
         boolean lIsFirst = true;
         MNameComponent lClassProp = null;
@@ -1304,7 +1304,7 @@ private void genChildResolvers(int aInIdent, MClass aInParentClass, MClass aInCh
                     "objects."));
                 out.printHeaderComment(aInIdent,comment);
 
-                out.println(aInIdent,"void resolve" + lConcatenatedChildClassName + "(/* out */ std::vector<OF_SHARED_PTR<" + lFormattedChildClassName+ "> >& out)");
+                out.println(aInIdent,"void resolve" + lConcatenatedChildClassName + "(/* out */ std::vector<std::shared_ptr<" + lFormattedChildClassName+ "> >& out)");
                 out.println(aInIdent,"{");
                 out.println(aInIdent + 1, "opflex::modb::mointernal::MO::resolveChildren<" + lFormattedChildClassName + ">(");
                 out.println(aInIdent + 2, "getFramework(), CLASS_ID, getURI(), " + toUnsignedStr(aInChildClass.getClassAsPropId(aInParentClass)) + ", " + aInChildClass.getGID().getId() + ", out);");
@@ -1369,7 +1369,7 @@ private void genConstructor(int aInIdent, MClass aInClass)
             out.println(aInIdent, aInClass.getLID().getName() + "(");
             out.println(aInIdent + 1, "opflex::ofcore::OFFramework& framework,");
             out.println(aInIdent + 1, "const opflex::modb::URI& uri,");
-            out.println(aInIdent + 1, "const OF_SHARED_PTR<const opflex::modb::mointernal::ObjectInstance>& oi)");
+            out.println(aInIdent + 1, "const std::shared_ptr<const opflex::modb::mointernal::ObjectInstance>& oi)");
             out.println(aInIdent + 1, ": MO(framework, CLASS_ID, uri, oi) { }");
         }
         else
@@ -1380,7 +1380,7 @@ private void genConstructor(int aInIdent, MClass aInClass)
                 out.println(aInIdent + 1, "opflex::ofcore::OFFramework& framework,");
                 out.println(aInIdent + 1, "opflex::modb::ClassId classId,");
                 out.println(aInIdent + 1, "const opflex::modb::URI& uri,");
-                out.println(aInIdent + 1, "const OF_SHARED_PTR<const opflex::modb::mointernal::ObjectInstance>& oi)");
+                out.println(aInIdent + 1, "const std::shared_ptr<const opflex::modb::mointernal::ObjectInstance>& oi)");
                 if (aInClass.hasSuperclass())
                 {
                     MClass lSuperclass = aInClass.getSuperclass();