Sus auto does not compile: WaitContainer versus CallExpr

src/CMakeLists.txt

 add_library (libsystemc-clang
-	ModuleDecl.cpp
-	FindModule.cpp
-	SCModules.cpp
-	FindSCMain.cpp
-	FindPorts.cpp
-	FindTLMInterfaces.cpp
-	FindEvents.cpp
-	FindGlobalEvents.cpp
-	FindEntryFunctions.cpp
-	FindSensitivity.cpp
-	FindWait.cpp
-	FindNotify.cpp	
-	FindSignals.cpp
-	FindSimTime.cpp
-	FindConstructor.cpp	
-	SystemCClang.cpp
-	FindNetlist.cpp
-	FindArgument.cpp
-    Automata.cpp 
-    SuspensionAutomata.cpp
-#	SCuitable/GlobalSuspensionAutomata.cpp	
-#	SCuitable/FindGPUMacro.cpp	
+  ModuleDecl.cpp
+  FindModule.cpp
+  SCModules.cpp
+  FindSCMain.cpp
+  FindPorts.cpp
+  FindTLMInterfaces.cpp
+  FindEvents.cpp
+  FindGlobalEvents.cpp
+  FindEntryFunctions.cpp
+  FindSensitivity.cpp
+  FindWait.cpp
+  FindNotify.cpp  
+  FindSignals.cpp
+  FindSimTime.cpp
+  FindConstructor.cpp 
+  SystemCClang.cpp
+  FindNetlist.cpp
+  FindArgument.cpp
+  Automata.cpp 
+  SuspensionAutomata.cpp
+  SCuitable/GlobalSuspensionAutomata.cpp  
+  SCuitable/FindGPUMacro.cpp  
 ####################################
 #From here the files are for the reflection database
 ####################################
-	#Utility.cpp
-	EntryFunctionContainer.cpp
-	WaitContainer.cpp
-	NotifyContainer.cpp
-	EventDecl.cpp
-	ProcessDecl.cpp
-	Signal.cpp
-	PortDecl.cpp
-	InterfaceDecl.cpp
-	Model.cpp
-	WaitCalls.cpp
-	NotifyCalls.cpp	
-	EventContainer.cpp
+  #Utility.cpp
+  EntryFunctionContainer.cpp
+  WaitContainer.cpp
+  NotifyContainer.cpp
+  EventDecl.cpp
+  ProcessDecl.cpp
+  Signal.cpp
+  PortDecl.cpp
+  InterfaceDecl.cpp
+  Model.cpp
+  WaitCalls.cpp
+  NotifyCalls.cpp 
+  EventContainer.cpp
     # AST MATCHERS
     # matchers/sc_module.cpp
     
-	)
+  )

src/FindWait.h

@@ -13,7 +13,7 @@ namespace scpar {
   class FindWait:public RecursiveASTVisitor < FindWait > {
   public:
 
-    typedef vector < CallExpr * >waitListType;
+    typedef vector < CallExpr * > waitListType;
 
     typedef pair < CXXMethodDecl *,vector < string > >processWaitEventPairType;
     typedef map < CXXMethodDecl *, vector < string > >processWaitEventMapType;

src/SuspensionAutomata.h

@@ -130,8 +130,7 @@ namespace scpar {
     typedef pair<State*, vector<SusCFG*> > stateCommonCodeBlockPairType;
     typedef map<State *, vector<SusCFG*> > stateCommonCodeBlockMapType;
 
-    SuspensionAutomata(vector<WaitContainer*>, CXXMethodDecl *, ASTContext *,
-                       raw_ostream &);
+    SuspensionAutomata(vector<WaitContainer*>, CXXMethodDecl *, ASTContext *, llvm::raw_ostream &);
     ~SuspensionAutomata();
     void addRemainingBlocks(State*, vector<SusCFG*>&);
     void checkInsert(vector<SusCFG*>, vector<SusCFG*>&);

src/SystemCClang.cpp

@@ -111,7 +111,7 @@ bool SystemCConsumer::fire() {
           FindNotify findNotify{ ef->_entryMethodDecl, _os };
           ef->addNotifys(findNotify);
 
-          /*
+          /*          
             SuspensionAutomata suspensionAutomata(findWaits.getWaitCalls(), ef->getEntryMethod(), &_context, llvm::errs());
             if (suspensionAutomata.initialize()) {
             suspensionAutomata.genSusCFG();