Sus auto does not compile: WaitContainer versus CallExpr

src/CMakeLists.txt

@@ -19,8 +19,8 @@ add_library (libsystemc-clang
   FindArgument.cpp
   Automata.cpp 
   SuspensionAutomata.cpp
-#	SCuitable/GlobalSuspensionAutomata.cpp	
-#	SCuitable/FindGPUMacro.cpp	
+  SCuitable/GlobalSuspensionAutomata.cpp  
+  SCuitable/FindGPUMacro.cpp  
 ####################################
 #From here the files are for the reflection database
 ####################################

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*>&);