Typos.

diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp
index e5873bd..71e87ab 100644 (file)
--- a/include/simgrid/kernel/future.hpp
+++ b/include/simgrid/kernel/future.hpp
@@ -247,7 +247,7 @@ template <class T> Future<T> unwrap_future(Future<Future<T>> future);
  *    // available:
  *    try {
  *      // Try to get value, this might throw an exception if the operation
- *      // failed (such as an exception throwed by the worker process):
+ *      // failed (such as an exception thrown by the worker process):
  *      std::string value = result.get();
  *      XBT_INFO("Value: %s", value.c_str());
  *    }
@@ -434,7 +434,7 @@ template <class T> Future<T> unwrap_future(Future<Future<T>> future)
  *    }
  *    catch (...) {
  *      // If an error occured, we can set an exception which
- *      // will be throwed buy future.get():
+ *      // will be thrown by future.get():
  *      promise.set_exception(std::current_exception());
  *    }
  *  });

diff --git a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
index 758b519..718741b 100644 (file)
--- a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
+++ b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
@@ -52,7 +52,7 @@ static void master()
     simgrid::simix::kernel_sync([] {
       return kernel_wait_until(20).then([](simgrid::kernel::Future<void> f) {
         f.get();
-        throw example::exception("Exception throwed from kernel_defer");
+        throw example::exception("Exception thrown from kernel_defer");
       });
     });
     XBT_ERROR("No exception caught!");

diff --git a/teshsuite/simix/generic-simcalls/generic-simcalls.tesh b/teshsuite/simix/generic-simcalls/generic-simcalls.tesh
index 0cbed1d..e798ebb 100644 (file)
--- a/teshsuite/simix/generic-simcalls/generic-simcalls.tesh
+++ b/teshsuite/simix/generic-simcalls/generic-simcalls.tesh
@@ -4,7 +4,7 @@ $ ${bindir:=.}/generic-simcalls --cfg=contexts/stack-size:96 ${srcdir:=.}/exampl
 > [Tremblay:master:(1) 0.000000] [test/INFO] kernel, returned
 > [10.000000] [test/INFO] kernel_sync with void
 > [Tremblay:master:(1) 10.000000] [test/INFO] kernel_sync with void, returned
-> [Tremblay:master:(1) 20.000000] [test/INFO] Exception caught: Exception throwed from kernel_defer
+> [Tremblay:master:(1) 20.000000] [test/INFO] Exception caught: Exception thrown from kernel_defer
 > [30.000000] [test/INFO] kernel_sync with value
 > [Tremblay:master:(1) 30.000000] [test/INFO] kernel_sync with value returned with 42
 > [50.000000] [test/INFO] kernel_async with value