cllazyfile: work around LNK2005 error. had to tweak class members so MSVC didn't see MgrNodeBase class twice.

mpictor · mpictor · commit 36e34862cc4b · 2015-08-03T21:50:19.000-04:00
suspect there is a better solution, but I'm not sure what it would be
diff --git a/src/cllazyfile/lazyInstMgr.h b/src/cllazyfile/lazyInstMgr.h
@@ -73,8 +73,8 @@ class SC_LAZYFILE_EXPORT lazyInstMgr {
         void openFile( std::string fname );
 
         void addLazyInstance( namedLazyInstance inst );
-        instMgrAdapter * getAdapter() {
-            return _ima;
+        InstMgrBase * getAdapter() {
+            return ( InstMgrBase * ) _ima;
         }
 
         instanceRefs_t * getFwdRefs() {
diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc
@@ -17,7 +17,6 @@
 #include "lazyFileReader.h"
 #include "lazyInstMgr.h"
 #include "lazyTypes.h"
-#include "instMgrHelper.h"
 
 #include "current_function.hpp"
 

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ class SC_LAZYFILE_EXPORT lazyInstMgr {`
`73`	`73`	`void openFile( std::string fname );`
`74`	`74`
`75`	`75`	`void addLazyInstance( namedLazyInstance inst );`
`76`		`- instMgrAdapter * getAdapter() {`
`77`		`- return _ima;`
	`76`	`+ InstMgrBase * getAdapter() {`
	`77`	`+ return ( InstMgrBase * ) _ima;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`instanceRefs_t * getFwdRefs() {`