Skip to content

Commit

Permalink
Simplify, add MSVC exports
Browse files Browse the repository at this point in the history
  • Loading branch information
wesm committed Sep 25, 2019
1 parent 06f75cd commit c058e86
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 44 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

----------------------------------------------------------------------

cpp/src/arrow/vendored/base64.h and base64.cpp have the following license
cpp/src/arrow/vendored/base64.cpp has the following license

ZLIB License

Expand Down
16 changes: 15 additions & 1 deletion cpp/src/arrow/util/base64.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,18 @@

#pragma once

#include "arrow/vendored/base64.h" // IWYU pragma: export
#include <string>

#include "arrow/util/visibility.h"

namespace arrow {
namespace util {

ARROW_EXPORT
std::string base64_encode(unsigned char const*, unsigned int len);

ARROW_EXPORT
std::string base64_decode(std::string const& s);

} // namespace util
} // namespace arrow
2 changes: 1 addition & 1 deletion cpp/src/arrow/vendored/base64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/

#include "base64.h"
#include "arrow/util/base64.h"
#include <iostream>

namespace arrow {
Expand Down
41 changes: 0 additions & 41 deletions cpp/src/arrow/vendored/base64.h

This file was deleted.

0 comments on commit c058e86

Please sign in to comment.