diff options
author | Ian Lance Taylor <iant@golang.org> | 2013-10-09 10:35:46 -0700 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2013-10-09 10:35:46 -0700 |
commit | c774e902083c677cffb9873e7d46346bcbf8cc21 (patch) | |
tree | 8fec54a1660be00526ec425636e57e47eddbc5e9 /misc/swig | |
parent | cb309173874e3dd0dca19c904fd368b59e373906 (diff) | |
download | go-c774e902083c677cffb9873e7d46346bcbf8cc21.tar.gz go-c774e902083c677cffb9873e7d46346bcbf8cc21.zip |
cmd/go: add any .c/.cc files to the SWIG shared library
Also add the action's object directory to the list of
directories we use to find SWIG shared libraries.
Fixes #6521.
R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/14369043
Diffstat (limited to 'misc/swig')
-rw-r--r-- | misc/swig/callback/callback.cc | 15 | ||||
-rw-r--r-- | misc/swig/callback/callback.h | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/misc/swig/callback/callback.cc b/misc/swig/callback/callback.cc new file mode 100644 index 0000000000..eac24fba0d --- /dev/null +++ b/misc/swig/callback/callback.cc @@ -0,0 +1,15 @@ +// Copyright 2013 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// This .cc file will be automatically compiled by the go tool and +// included in the package. + +#include <string> +#include "callback.h" + +std::string Caller::call() { + if (callback_ != 0) + return callback_->run(); + return ""; +} diff --git a/misc/swig/callback/callback.h b/misc/swig/callback/callback.h index 80232a8b3d..97bf73cc28 100644 --- a/misc/swig/callback/callback.h +++ b/misc/swig/callback/callback.h @@ -16,9 +16,5 @@ public: ~Caller() { delCallback(); } void delCallback() { delete callback_; callback_ = 0; } void setCallback(Callback *cb) { delCallback(); callback_ = cb; } - std::string call() { - if (callback_ != 0) - return callback_->run(); - return ""; - } + std::string call(); }; |