fix compilation errors

skaarj1989 · skaarj1989 · commit 9c7ed5173272 · 2022-11-27T22:58:46.000+01:00
diff --git a/include/fg/FrameGraph.inl b/include/fg/FrameGraph.inl
@@ -21,7 +21,7 @@ inline const Data &FrameGraph::addCallbackPass(const std::string_view name,
 }
 
 _VIRTUALIZABLE_CONCEPT_IMPL
-inline typename const T::Desc &
+inline const typename T::Desc &
 FrameGraph::getDescriptor(FrameGraphResource id) {
   return _getResourceEntry(id)._getModel<T>()->descriptor;
 }
@@ -71,7 +71,7 @@ inline T &FrameGraphPassResources::get(FrameGraphResource id) {
 }
 
 _VIRTUALIZABLE_CONCEPT_IMPL
-inline typename const T::Desc &
+inline const typename T::Desc &
 FrameGraphPassResources::getDescriptor(FrameGraphResource id) const {
   assert(m_passNode.reads(id) || m_passNode.creates(id) ||
          m_passNode.writes(id));
diff --git a/include/fg/ResourceEntry.inl b/include/fg/ResourceEntry.inl
@@ -8,7 +8,7 @@ template <typename T> inline T &ResourceEntry::get() {
   return _getModel<T>()->resource;
 }
 template <typename T>
-inline typename const T::Desc &ResourceEntry::getDescriptor() const {
+inline const typename T::Desc &ResourceEntry::getDescriptor() const {
   return _getModel<T>()->descriptor;
 }
 
diff --git a/tests/test.cpp b/tests/test.cpp
@@ -32,7 +32,7 @@ struct FrameGraphTexture {
   }
   void destroy(const Desc &, void *) {}
 
-  void preRead(uint32_t flags, void *) {}
+  void preRead(const Desc &, uint32_t flags, void *) {}
   void preWrite() {}
 
   static const char *toString(const Desc &desc) { return "<I>texture</I>"; }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ inline const Data &FrameGraph::addCallbackPass(const std::string_view name,`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`_VIRTUALIZABLE_CONCEPT_IMPL`
`24`		`-inline typename const T::Desc &`
	`24`	`+inline const typename T::Desc &`
`25`	`25`	`FrameGraph::getDescriptor(FrameGraphResource id) {`
`26`	`26`	`return _getResourceEntry(id)._getModel<T>()->descriptor;`
`27`	`27`	`}`
`@@ -71,7 +71,7 @@ inline T &FrameGraphPassResources::get(FrameGraphResource id) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`_VIRTUALIZABLE_CONCEPT_IMPL`
`74`		`-inline typename const T::Desc &`
	`74`	`+inline const typename T::Desc &`
`75`	`75`	`FrameGraphPassResources::getDescriptor(FrameGraphResource id) const {`
`76`	`76`	`assert(m_passNode.reads(id) \|\| m_passNode.creates(id) \|\|`
`77`	`77`	`m_passNode.writes(id));`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ template <typename T> inline T &ResourceEntry::get() {`
`8`	`8`	`return _getModel<T>()->resource;`
`9`	`9`	`}`
`10`	`10`	`template <typename T>`
`11`		`-inline typename const T::Desc &ResourceEntry::getDescriptor() const {`
	`11`	`+inline const typename T::Desc &ResourceEntry::getDescriptor() const {`
`12`	`12`	`return _getModel<T>()->descriptor;`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ struct FrameGraphTexture {`
`32`	`32`	`}`
`33`	`33`	`void destroy(const Desc &, void *) {}`
`34`	`34`
`35`		`- void preRead(uint32_t flags, void *) {}`
	`35`	`+ void preRead(const Desc &, uint32_t flags, void *) {}`
`36`	`36`	`void preWrite() {}`
`37`	`37`
`38`	`38`	`static const char *toString(const Desc &desc) { return "<I>texture</I>"; }`