X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_smach.h;h=992d09bba7dc2f630bafc646988b5f0414ed4956;hb=01ac089e243c721d088a117cc7a8505cb5da80d8;hp=876b6d4917054b4eca0bdd4dc48b210f41983acb;hpb=4ec81d053bf1d0cbcd9f0bf048914ec8eca08f4c;p=synfig.git diff --git a/ETL/trunk/ETL/_smach.h b/ETL/trunk/ETL/_smach.h index 876b6d4..992d09b 100644 --- a/ETL/trunk/ETL/_smach.h +++ b/ETL/trunk/ETL/_smach.h @@ -38,7 +38,7 @@ #ifdef _MSC_VER #pragma warning (disable:4786) -#pragma warning (disable:4290) // MSVC6 doesnt like function declarations with exception specs +#pragma warning (disable:4290) // MSVC6 doesn't like function declarations with exception specs #endif //#define ETL_MUTEX_LOCK() _mutex::lock lock(mutex) @@ -338,7 +338,7 @@ public: const state_base *prev_state=default_state; // If we are already in a state, leave it and - // colapse the state stack + // collapse the state stack if(default_state) default_state->leave_state(default_context); @@ -416,7 +416,7 @@ public: const state_base *prev_state=curr_state; // If we are already in a state, leave it and - // colapse the state stack + // collapse the state stack if(curr_state) egress();