diff --git a/compiler2/ttcn3/Statement.cc b/compiler2/ttcn3/Statement.cc
index bd76e24e616712a448421b7132c115744e2dd9f5..8b97d8fd14798c890bfe253b0aa9458763f80ed4 100644
--- a/compiler2/ttcn3/Statement.cc
+++ b/compiler2/ttcn3/Statement.cc
@@ -518,12 +518,12 @@ namespace Ttcn {
     }
     if (finally_block != NULL) {
       string tmp_id = get_scope_mod_gen()->get_temporary_id();
-      /*str = mputprintf(str,
+#if __cplusplus < 201103L
+      str = mputprintf(str,
         "class %s_finally {\n"
         "public:\n", tmp_id.c_str());
       // TODO: all local declarations (or those referenced in the 'finally' block) need to
       // be added as members of this class, so the destructor can reach them
-      // or the C++11 code could be used...
       if (include_location_info) {
         str = mputprintf(str,
           "TTCN_Location& current_location;\n"
@@ -538,12 +538,14 @@ namespace Ttcn {
         "};\n"
         "%s_finally %s%s;\n",
         tmp_id.c_str(), tmp_id.c_str(),
-        include_location_info ? "(current_location)" : "");*/
+        include_location_info ? "(current_location)" : "");
+#else
       // C++11 version:
       str = mputprintf(str,
         "FINALLY %s([&] {\n", tmp_id.c_str());
       str = finally_block->generate_code(str, def_glob_vars, src_glob_vars);
       str = mputstr(str, "});\n");
+#endif
     }
     if (catch_blocks.size() > 0) {
       str = mputstr(str, "try {\n");
diff --git a/core/OOP.hh b/core/OOP.hh
index d862def764b9bc813c577d7e9e4da24cd9da47e9..2d11e25f86b6474bbdb918d078bf0139ef89291f 100644
--- a/core/OOP.hh
+++ b/core/OOP.hh
@@ -284,6 +284,7 @@ public:
   T& operator()() { return *exc_ptr->val_ptr; }
 };
 
+#if __cplusplus >= 201103L
 class FINALLY
 {
   std::function<void(void)> functor;
@@ -294,6 +295,7 @@ public:
     functor();
   }
 };
+#endif // C++11
 
 #endif /* OOP_HH */