aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/atom.h
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2013-01-28 14:32:54 +0100
committerSverker Eriksson <[email protected]>2013-01-28 14:32:54 +0100
commit58482ed3f2b2f90f8be35b85d5d16f3f40f80fa3 (patch)
treea22f36b6de5d54769d2392b79edf1366964a8a5c /erts/emulator/beam/atom.h
parentd4fd0da2e1fc541bae7ed2de362f8a5f69357e27 (diff)
parent6c61689ae326587dfc9bcebd0fc6d6fa40dfd1fb (diff)
downloadotp-58482ed3f2b2f90f8be35b85d5d16f3f40f80fa3.tar.gz
otp-58482ed3f2b2f90f8be35b85d5d16f3f40f80fa3.tar.bz2
otp-58482ed3f2b2f90f8be35b85d5d16f3f40f80fa3.zip
Merge branch 'sverk/enc_atom-opt'
* sverk/enc_atom-opt: erts: Optimize atom encoding to use memcpy for pure ascii erts: Refactor erts_atom_get to use ErtsAtomEncoding
Diffstat (limited to 'erts/emulator/beam/atom.h')
-rw-r--r--erts/emulator/beam/atom.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/atom.h b/erts/emulator/beam/atom.h
index 1d3c4cb922..5904ae0f7e 100644
--- a/erts/emulator/beam/atom.h
+++ b/erts/emulator/beam/atom.h
@@ -139,7 +139,7 @@ int atom_static_put(byte*, int);
void init_atom_table(void);
void atom_info(int, void *);
void dump_atoms(int, void *);
-int erts_atom_get(const char* name, int len, Eterm* ap, int is_latin1);
+int erts_atom_get(const char* name, int len, Eterm* ap, ErtsAtomEncoding enc);
void erts_atom_get_text_space_sizes(Uint *reserved, Uint *used);
#endif