Skip to content

Commit

Permalink
rename eosiolib (EOSIO#91)
Browse files Browse the repository at this point in the history
* move eosio include

* modify eosio includes

* rename eosiolib folder

* rename eosiolib.cpp

* rename all eosiolib
  • Loading branch information
Enumivo authored May 14, 2018
1 parent be442c6 commit 412ae3a
Show file tree
Hide file tree
Showing 130 changed files with 269 additions and 269 deletions.
4 changes: 2 additions & 2 deletions contracts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set(DEFAULT_SYSTEM_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts/libc++/upstream

set(STANDARD_INCLUDE_FOLDERS ${CMAKE_SOURCE_DIR}/contracts ${CMAKE_SOURCE_DIR}/externals/magic_get/include)

add_subdirectory(eosiolib)
add_subdirectory(enumivolib)
add_subdirectory(musl)
add_subdirectory(libc++)
add_subdirectory(simple.token)
Expand Down Expand Up @@ -46,7 +46,7 @@ add_custom_command(OUTPUT share/eosio/skeleton/skeleton.cpp
VERBATIM)
add_custom_target(copy_skeleton_contract ALL DEPENDS share/eosio/skeleton/skeleton.cpp)

install(DIRECTORY eosiolib DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
install(DIRECTORY enumivolib DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
install(DIRECTORY eosio.system DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
install(DIRECTORY musl DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
install(DIRECTORY libc++ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
Expand Down
2 changes: 1 addition & 1 deletion contracts/asserter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

add_wast_executable(TARGET asserter
INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
LIBRARIES libc libc++ eosiolib
LIBRARIES libc libc++ enumivolib
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
)
2 changes: 1 addition & 1 deletion contracts/asserter/asserter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright defined in eos/LICENSE.txt
*/

#include <eosiolib/eosio.hpp>
#include <enumivolib/eosio.hpp>

namespace asserter {
struct assertdef {
Expand Down
2 changes: 1 addition & 1 deletion contracts/bancor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

add_wast_executable(TARGET bancor
INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
LIBRARIES libc libc++ eosiolib
LIBRARIES libc libc++ enumivolib
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
)
8 changes: 4 additions & 4 deletions contracts/bancor/bancor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
*/
#pragma once

#include <eosiolib/eos.hpp>
#include <eosiolib/token.hpp>
#include <eosiolib/reflect.hpp>
#include <eosiolib/generic_currency.hpp>
#include <enumivolib/eos.hpp>
#include <enumivolib/token.hpp>
#include <enumivolib/reflect.hpp>
#include <enumivolib/generic_currency.hpp>

#include <bancor/converter.hpp>
#include <currency/currency.hpp>
Expand Down
2 changes: 1 addition & 1 deletion contracts/dice/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

add_wast_executable(TARGET dice
INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
LIBRARIES libc++ libc eosiolib
LIBRARIES libc++ libc enumivolib
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
)
8 changes: 4 additions & 4 deletions contracts/dice/dice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#include <utility>
#include <vector>
#include <string>
#include <eosiolib/eosio.hpp>
#include <eosiolib/asset.hpp>
#include <eosiolib/contract.hpp>
#include <eosiolib/crypto.h>
#include <enumivolib/eosio.hpp>
#include <enumivolib/asset.hpp>
#include <enumivolib/contract.hpp>
#include <enumivolib/crypto.h>

using eosio::key256;
using eosio::indexed_by;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_wast_library(TARGET eosiolib
add_wast_library(TARGET enumivolib
INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}" ${CMAKE_SOURCE_DIR}/externals/magic_get/include
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/system.h>
#include <enumivolib/system.h>

extern "C" {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/action.h>
#include <eosiolib/datastream.hpp>
#include <eosiolib/serialize.hpp>
#include <enumivolib/action.h>
#include <enumivolib/datastream.hpp>
#include <enumivolib/serialize.hpp>

#include <boost/preprocessor/variadic/size.hpp>
#include <boost/preprocessor/variadic/to_tuple.hpp>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include <eosiolib/serialize.hpp>
#include <eosiolib/print.hpp>
#include <eosiolib/system.h>
#include <enumivolib/serialize.hpp>
#include <enumivolib/print.hpp>
#include <enumivolib/system.h>
#include <tuple>
#include <limits>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
#pragma once

#include <eosiolib/types.h>
#include <enumivolib/types.h>

/**
* @defgroup chainapi Chain API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
#pragma once

#include <eosiolib/system.h>
#include <enumivolib/system.h>

extern "C" {
/**
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/types.h>
#include <enumivolib/types.h>
extern "C" {
/**
* This method is implemented as:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include <eosiolib/eosio.hpp>
#include <eosiolib/asset.hpp>
#include <eosiolib/multi_index.hpp>
#include <enumivolib/eosio.hpp>
#include <enumivolib/asset.hpp>
#include <enumivolib/multi_index.hpp>

namespace eosio {
using std::string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/system.h>
#include <eosiolib/memory.h>
#include <eosiolib/vector.hpp>
#include <enumivolib/system.h>
#include <enumivolib/memory.h>
#include <enumivolib/vector.hpp>
#include <boost/container/flat_set.hpp>
#include <boost/container/flat_map.hpp>
#include <eosiolib/varint.hpp>
#include <enumivolib/varint.hpp>
#include <array>
#include <set>
#include <map>
Expand Down
2 changes: 1 addition & 1 deletion contracts/eosiolib/db.h → contracts/enumivolib/db.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
#pragma once

#include <eosiolib/types.h>
#include <enumivolib/types.h>
extern "C" {
/**
* @defgroup database Database API
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <eosiolib/print.hpp>
#include <eosiolib/action.hpp>
#include <enumivolib/print.hpp>
#include <enumivolib/action.hpp>

#include <boost/fusion/adapted/std_tuple.hpp>
#include <boost/fusion/include/std_tuple.hpp>
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions contracts/enumivolib/eosio.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* @file
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <enumivolib/types.hpp>
#include <enumivolib/action.hpp>
#include <enumivolib/print.hpp>
#include <enumivolib/multi_index.hpp>
#include <enumivolib/dispatcher.hpp>
#include <enumivolib/contract.hpp>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <algorithm>
#include <type_traits>

#include <eosiolib/system.h>
#include <enumivolib/system.h>

namespace eosio {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <eosiolib/types.h>
#include <eosiolib/print.hpp>
#include <enumivolib/types.h>
#include <enumivolib/print.hpp>

namespace eosio
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
#pragma once

#include <string.h>
#include <eosiolib/types.h>
#include <enumivolib/types.h>
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/
#pragma once

#include <eosiolib/memory.h>
#include <eosiolib/print.hpp>
#include <enumivolib/memory.h>
#include <enumivolib/print.hpp>

void* sbrk(size_t num_bytes);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

#include <boost/multi_index/mem_fun.hpp>

#include <eosiolib/action.h>
#include <eosiolib/types.hpp>
#include <eosiolib/serialize.hpp>
#include <eosiolib/datastream.hpp>
#include <eosiolib/db.h>
#include <eosiolib/fixed_key.hpp>
#include <enumivolib/action.h>
#include <enumivolib/types.hpp>
#include <enumivolib/serialize.hpp>
#include <enumivolib/datastream.hpp>
#include <enumivolib/db.h>
#include <enumivolib/fixed_key.hpp>

namespace eosio {

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/types.h>
#include <enumivolib/types.h>

extern "C" {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/
#pragma once

#include <eosiolib/permission.h>
#include <eosiolib/transaction.hpp>
#include <enumivolib/permission.h>
#include <enumivolib/transaction.hpp>

#include <set>
#include <limits>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
#pragma once

#include <eosiolib/types.h>
#include <enumivolib/types.h>

#ifdef __cplusplus
extern "C" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/print.h>
#include <eosiolib/types.hpp>
#include <eosiolib/fixed_key.hpp>
#include <enumivolib/print.h>
#include <enumivolib/types.hpp>
#include <enumivolib/fixed_key.hpp>
#include <utility>
#include <string>

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include <eosiolib/privileged.hpp>
#include <enumivolib/privileged.hpp>

#include <vector>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <eosiolib/varint.hpp>
#include <eosiolib/serialize.hpp>
#include <enumivolib/varint.hpp>
#include <enumivolib/serialize.hpp>

namespace eosio {
struct public_key {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <eosiolib/multi_index.hpp>
#include <eosiolib/system.h>
#include <enumivolib/multi_index.hpp>
#include <enumivolib/system.h>

namespace eosio {

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/types.h>
#include <enumivolib/types.h>

extern "C" {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/types.h>
#include <enumivolib/types.h>

extern "C" {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/transaction.h>
#include <eosiolib/action.hpp>
#include <eosiolib/print.hpp>
#include <eosiolib/types.hpp>
#include <eosiolib/serialize.hpp>
#include <enumivolib/transaction.h>
#include <enumivolib/action.hpp>
#include <enumivolib/print.hpp>
#include <enumivolib/types.hpp>
#include <enumivolib/serialize.hpp>
#include <vector>

namespace eosio {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @copyright defined in eos/LICENSE.txt
*/
#pragma once
#include <eosiolib/types.h>
#include <enumivolib/types.h>
#include <functional>
#include <tuple>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <eosiolib/memory.hpp>
#include <eosiolib/stdlib.hpp>
#include <enumivolib/memory.hpp>
#include <enumivolib/stdlib.hpp>
#include <vector>

namespace eosio {
Expand Down
2 changes: 1 addition & 1 deletion contracts/eosio.bios/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

add_wast_executable(TARGET eosio.bios
INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
LIBRARIES libc++ libc eosiolib
LIBRARIES libc++ libc enumivolib
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
)
4 changes: 2 additions & 2 deletions contracts/eosio.bios/eosio.bios.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <eosiolib/eosio.hpp>
#include <eosiolib/privileged.hpp>
#include <enumivolib/eosio.hpp>
#include <enumivolib/privileged.hpp>

namespace eosio {

Expand Down
Loading

0 comments on commit 412ae3a

Please sign in to comment.