A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore explicitely defined constructor (with empty body).
[simgrid.git]
/
src
/
smpi
/
include
/
smpi_f2c.hpp
diff --git
a/src/smpi/include/smpi_f2c.hpp
b/src/smpi/include/smpi_f2c.hpp
index
49f7828
..
0b96ef9
100644
(file)
--- a/
src/smpi/include/smpi_f2c.hpp
+++ b/
src/smpi/include/smpi_f2c.hpp
@@
-1,6
+1,6
@@
/* Handle Fortan - C conversion for MPI Types*/
/* Handle Fortan - C conversion for MPI Types*/
-/* Copyright (c) 2010
, 2013-2017
. The SimGrid Team.
+/* Copyright (c) 2010
-2019
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,7
+9,8
@@
#ifndef SMPI_F2C_HPP_INCLUDED
#define SMPI_F2C_HPP_INCLUDED
#ifndef SMPI_F2C_HPP_INCLUDED
#define SMPI_F2C_HPP_INCLUDED
-#include "xbt/dict.h"
+#include <unordered_map>
+#include <string>
#define KEY_SIZE (sizeof(int) * 2 + 1)
#define KEY_SIZE (sizeof(int) * 2 + 1)
@@
-20,24
+21,29
@@
class F2C {
private:
// We use a single lookup table for every type.
// Beware of collisions if id in mpif.h is not unique
private:
// We use a single lookup table for every type.
// Beware of collisions if id in mpif.h is not unique
- static
xbt_dict_t
f2c_lookup_;
+ static
std::unordered_map<std::string, F2C*>*
f2c_lookup_;
static int f2c_id_;
static int f2c_id_;
+ int my_f2c_id_ = -1;
+
protected:
protected:
- static
xbt_dict_t
f2c_lookup();
- static void set_f2c_lookup(
xbt_dict_t dict
);
+ static
std::unordered_map<std::string, F2C*>*
f2c_lookup();
+ static void set_f2c_lookup(
std::unordered_map<std::string, F2C*>* map
);
static int f2c_id();
static void f2c_id_increment();
static int f2c_id();
static void f2c_id_increment();
+
public:
public:
+ char* get_my_key(char* key);
static char* get_key(char* key, int id);
static char* get_key(char* key, int id);
- static char* get_key_id(char* key, int id);
static void delete_lookup();
static void delete_lookup();
- static xbt_dict_t lookup();
+ static std::unordered_map<std::string, F2C*>* lookup();
+ F2C() {}
+ virtual ~F2C() = default;
//Override these to handle specific values.
//Override these to handle specific values.
- int add_f();
+
virtual
int add_f();
static void free_f(int id);
static void free_f(int id);
- int c2f();
-
+
virtual
int c2f();
+ static void print_f2c_lookup();
// This method should be overridden in all subclasses to avoid casting the result when calling it.
// For the default one, the MPI_*_NULL returned is assumed to be NULL.
static F2C* f2c(int id);
// This method should be overridden in all subclasses to avoid casting the result when calling it.
// For the default one, the MPI_*_NULL returned is assumed to be NULL.
static F2C* f2c(int id);